Skip to content

Addin no-op change to show build is broken #1830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
forki wants to merge 3 commits into from
Closed

Addin no-op change to show build is broken #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e07cced
Small cleanup
forki Nov 24, 2016
eea743c
Add type hints
forki Nov 24, 2016
6333713
Add type hints
forki Nov 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ let CollectErrorOrWarning (implicitIncludeDir,showFullPaths,flattenErrors,errorS
sprintf "%s(%d,%d,%d,%d): " file m.StartLine m.StartColumn m.EndLine m.EndColumn, m, file
else
"", m, file
{ Range = m; TextRepresentation = text; IsEmpty = false; File = file }
{ Range = m; TextRepresentation = text; IsEmpty = false; File = file } : ErrorLocation

match err.Exception with
| ReportedError _ ->
Expand Down
14 changes: 7 additions & 7 deletions src/fsharp/TastOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ let emptyTyparInst = ([] : TyparInst)

[<NoEquality; NoComparison>]
type Remap =
{ tpinst : TyparInst;
valRemap: ValRemap;
tyconRefRemap : TyconRefRemap;
{ tpinst : TyparInst
valRemap: ValRemap
tyconRefRemap : TyconRefRemap
removeTraitSolutions: bool }

let emptyRemap =
{ tpinst = emptyTyparInst;
tyconRefRemap = emptyTyconRefRemap;
valRemap = ValMap.Empty;
{ tpinst = emptyTyparInst
tyconRefRemap = emptyTyconRefRemap
valRemap = ValMap.Empty
removeTraitSolutions = false }

type Remap with
Expand Down Expand Up @@ -304,7 +304,7 @@ and remapNonLocalValRef tyenv (nlvref:NonLocalValOrMemberRef) =
let vlink' = remapValLinkage tyenv vlink
if eref === eref' && vlink === vlink' then nlvref else
{ EnclosingEntity = eref'
ItemKey = vlink' }
ItemKey = vlink' } : NonLocalValOrMemberRef

and remapValRef tmenv (vref: ValRef) =
match tmenv.valRemap.TryFind vref.Deref with
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/TcGlobals.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
|> List.filter (fun (_, tcref, _) -> tcref.CanDeref)
|> List.map (fun (_, tcref, builder) -> tcref.Stamp, builder)
|> Dictionary.ofList
(fun tcref2 tinst ->
(fun (tcref2:EntityRef) tinst ->
let dict = dict.Value
let key = tcref2.Stamp
if dict.ContainsKey key then Some(dict.[key] tinst)
Expand Down
5 changes: 3 additions & 2 deletions src/fsharp/vs/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,13 +2019,14 @@ and FSharpParameter(cenv, typ:TType, topArgInfo:ArgReprInfo, mOpt, isParamArrayA
and FSharpAssemblySignature private (cenv, topAttribs: TypeChecker.TopAttribs option, optViewedCcu: CcuThunk option, mtyp: ModuleOrNamespaceType) =

// Assembly signature for a referenced/linked assembly
new (cenv, ccu: CcuThunk) = FSharpAssemblySignature((if ccu.IsUnresolvedReference then cenv else (new cenv(cenv.g, ccu, cenv.tcImports))), None, Some ccu, ccu.Contents.ModuleOrNamespaceType)
new (cenv:cenv, ccu: CcuThunk) =
let cenv = if ccu.IsUnresolvedReference then cenv else (new cenv(cenv.g, ccu, cenv.tcImports))
FSharpAssemblySignature(cenv, None, Some ccu, ccu.Contents.ModuleOrNamespaceType)

// Assembly signature for an assembly produced via type-checking.
new (g, thisCcu, tcImports, topAttribs, mtyp) = FSharpAssemblySignature(cenv(g, thisCcu, tcImports), topAttribs, None, mtyp)

member __.Entities =

let rec loop (rmtyp : ModuleOrNamespaceType) =
[| for entity in rmtyp.AllEntities do
if entity.IsNamespace then
Expand Down