Skip to content

[RFC FS-1001 POC] String Interpolation [WIP] #6770

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
yatli wants to merge 21 commits into from
Closed

[RFC FS-1001 POC] String Interpolation [WIP] #6770

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a52d9e7
minor touch: typo
May 18, 2019
083f431
Merge branch 'master' of https://github.com/dotnet/fsharp
May 20, 2019
19b33f8
checkpoint.
May 20, 2019
f3fa739
captures are put in the envs. prepare to build specializers for captu…
May 21, 2019
3fc2b79
findNextFormatSpecifier also needs to consider '{'
May 21, 2019
30b8147
add comments
May 21, 2019
52648bf
checkpoint.
Jun 17, 2019
a669330
checkpoint.
Jun 18, 2019
b293dcd
Final/Chain specializers for n>1
Jun 18, 2019
fcc1adc
(temp) vim session file for the folds..
Jun 18, 2019
17f8788
checkpoint.
Jun 18, 2019
fa3301d
checkpoint.
Jun 19, 2019
eec4129
printf.fs: capture-related code complete
Jun 20, 2019
075619f
expect Types from codegen, not runtime
Jun 20, 2019
5c6fe9e
prepare to work on lexer/parser
Jun 21, 2019
41abd26
cleanup, ignore vim session files
Jul 2, 2019
f507ac8
Merge branch 'master' into master
dsyme Jul 3, 2019
6e23c9c
cleanup, ignore editor config files
Jul 3, 2019
07d0fd8
PopValueUnsafe uppercase
Jul 3, 2019
f75ab75
PrintFormat: capture fields should be immutable
Jul 3, 2019
fadb047
printf: Type is in System namespace
Jul 4, 2019
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
Prev Previous commit
Next Next commit
PrintFormat: capture fields should be immutable
  • Loading branch information
Yatao Li committed Jul 3, 2019
commit f75ab75e24c02cd395c57d8263c2fc0a12009603
27 changes: 10 additions & 17 deletions src/fsharp/FSharp.Core/printf.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,16 @@

namespace Microsoft.FSharp.Core

type PrintfFormat<'Printer,'State,'Residue,'Result>(value:string) =

internal new(value, caps, types) as this =
PrintfFormat<_,_,_,_>(value)
then this.Captures <- caps
this.Types <- types

member __.Value = value
member val internal Captures: obj[] = Unchecked.defaultof<obj[]> with get, set
member val internal Types: System.Type[] = Unchecked.defaultof<System.Type[]> with get, set
override __.ToString() = value

type PrintfFormat<'Printer,'State,'Residue,'Result,'Tuple>(value:string) =
inherit PrintfFormat<'Printer,'State,'Residue,'Result>(value)
internal new(value, caps) as this =
PrintfFormat<_,_,_,_,_>(value)
then this.Captures <- caps
type PrintfFormat<'Printer,'State,'Residue,'Result>(value: string, captures: obj[], types: Type[]) =
new(value) = new PrintfFormat<'Printer,'State,'Residue,'Result>(value, null, null)
member __.Value = value
member __.Captures = captures
member __.Types = types
override __.ToString() = value

type PrintfFormat<'Printer,'State,'Residue,'Result,'Tuple>(value: string, captures: obj[], types: Type[]) =
inherit PrintfFormat<'Printer,'State,'Residue,'Result>(value, captures, types)
new(value) = new PrintfFormat<'Printer,'State,'Residue,'Result, 'Tuple>(value, null, null)

type Format<'Printer,'State,'Residue,'Result> = PrintfFormat<'Printer,'State,'Residue,'Result>
type Format<'Printer,'State,'Residue,'Result,'Tuple> = PrintfFormat<'Printer,'State,'Residue,'Result,'Tuple>
Expand Down