NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit9a1ba4a

committed

Make .NET 4.0 compiler align with Silverlight capabilitiies

The Microsoft.FSharp.Compiler.Silverlight DLL has a class that lets youcreate a hosted F# Interactive session. This adds that capability to the.NET 4.0 build.

1 parent26f8169 commit9a1ba4aCopy full SHA for 9a1ba4a

File tree

3 files changed

+177

-51

lines changed

src/fsharp/fsi
- console.fs
- fsi.fs
tests/hosting
- hosted.fsx

3 files changed

+177

-51

lines changed

`‎src/fsharp/fsi/console.fs‎`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ open Internal.Utilities`
`12`	`12`	`/// When this fix flag is true, this byte is converted to a char using the System.Console.InputEncoding.`
`13`	`13`	`/// This is a code-around for bug://1345.`
`14`	`14`	`/// Fixes to System.Console.ReadKey may break this code around, hence the option here.`
`15`		`-moduleConsoleOptions=`
	`15`	`+moduleinternalConsoleOptions=`
`16`	`16`
`17`	`17`	`// Bug 4254 was fixed in Dev11 (Net4.5), so this flag tracks making this fix up version specific.`
`18`	`18`	`letfixupRequired=not FSharpEnvironment.IsRunningOnNetFx45OrAbove`
`@@ -35,10 +35,10 @@ module ConsoleOptions =`
`35`	`35`	`else`
`36`	`36`	`c`
`37`	`37`
`38`		`-typeStyle= Prompt\| Out\| Error`
	`38`	`+typeinternalStyle= Prompt\| Out\| Error`
`39`	`39`
`40`	`40`	`/// Class managing the command History.`
`41`		`-typeHistory()=`
	`41`	`+typeinternalHistory()=`
`42`	`42`	`letlist=new List<string>()`
`43`	`43`	`let mutablecurrent=0`
`44`	`44`
`@@ -73,14 +73,14 @@ type History() =`
`73`	`73`
`74`	`74`	`/// List of available optionsCache`
`75`	`75`
`76`		`-typeOptions()=`
	`76`	`+typeinternalOptions()=`
`77`	`77`	`inherit History()`
`78`	`78`	`let mutableroot=""`
`79`	`79`	`memberx.Rootwith get()= rootandset(v)=(root<- v)`
`80`	`80`
`81`	`81`	`/// Cursor position management`
`82`	`82`
`83`		`-moduleUtils=`
	`83`	`+moduleinternalUtils=`
`84`	`84`
`85`	`85`	`openSystem`
`86`	`86`	`openSystem.Reflection`
`@@ -129,7 +129,7 @@ module Utils =`
`129`	`129`
`130`	`130`
`131`	`131`	`[<Sealed>]`
`132`		`-typeCursor=`
	`132`	`+typeinternalCursor=`
`133`	`133`	`static memberResetTo(top,left)=`
`134`	`134`	`Utils.guard(fun()->`
`135`	`135`	`Console.CursorTop<- top;`
`@@ -140,7 +140,7 @@ type Cursor =`
`140`	`140`	`letleft= inset+ position%(Console.BufferWidth- inset)`
`141`	`141`	`Cursor.ResetTo(top,left)`
`142`	`142`
`143`		`-typeAnchor=`
	`143`	`+typeinternalAnchor=`
`144`	`144`	`{top:int; left:int}`
`145`	`145`	`static memberCurrent(inset)={top=Console.CursorTop;left= max inset Console.CursorLeft}`
`146`	`146`
`@@ -150,7 +150,7 @@ type Anchor =`
`150`	`150`	`lettop= p.top+((p.left- inset)+ index)/(Console.BufferWidth- inset)`
`151`	`151`	`Cursor.ResetTo(top,left)`
`152`	`152`
`153`		`-typeReadLineConsole()=`
	`153`	`+typeinternalReadLineConsole()=`
`154`	`154`	`lethistory=new History()`
`155`	`155`	`let mutablecomplete:(string option* string-> seq<string>) =fun(_s1,_s2)-> Seq.empty`
`156`	`156`	`memberx.SetCompletionFunction f= complete<- f`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9a1ba4a

File tree

3 files changed

3 files changed

`‎src/fsharp/fsi/console.fs‎`

0 commit comments