Skip to content
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

[WIP, RFC FS-1072] task and state machine support #6634

Closed
wants to merge 62 commits into from
Closed

[WIP, RFC FS-1072] task and state machine support #6634

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f4bd221
use proto on mac and linux
dsyme Mar 29, 2019
8a4baf3
reduce diff
dsyme Mar 30, 2019
0474a23
reduce diff
dsyme Mar 30, 2019
b96120e
reduce diff
dsyme Mar 30, 2019
cf9147b
reduce diff
dsyme Mar 30, 2019
286c336
reduce diff
dsyme Mar 30, 2019
7a6448e
reduce diff
dsyme Mar 30, 2019
965d3b1
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Apr 2, 2019
978414c
Merge branch 'master' into proto
KevinRansom Apr 8, 2019
95d94de
integrate master
dsyme Apr 14, 2019
a15ef59
integrate master
dsyme Apr 14, 2019
aed6752
fix build
dsyme Apr 14, 2019
bb78e5f
fix build
dsyme Apr 14, 2019
b88d23c
Merge branch 'fix77' into proto
dsyme Apr 14, 2019
1aa6a41
load right FSHarp.Build
dsyme Apr 15, 2019
058bdc9
publish proto apps
dsyme Apr 15, 2019
688850f
revert test env changes
dsyme Apr 15, 2019
c2c7213
revert testing changes
dsyme Apr 16, 2019
fdcf82a
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 16, 2019
e46dcd5
don't repeat bootstrap
dsyme Apr 16, 2019
75e9cc3
be systematic about verbosity
dsyme Apr 17, 2019
d0f51d7
Merge branch 'proto' of https://github.com/dsyme/visualfsharp into proto
dsyme Apr 17, 2019
63c64ef
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 18, 2019
8f09004
remove verbosity flags
dsyme Apr 24, 2019
7b012b6
task builder insertion attempt
dsyme Apr 24, 2019
67d4815
fix build
dsyme Apr 24, 2019
4ab8297
fix build, re-enable commented-out bits, hide representations
dsyme Apr 25, 2019
4185ce6
add tests (not yet in test dll)
dsyme Apr 25, 2019
b288b48
butcher in state machine approximation
dsyme Apr 28, 2019
f43ec65
butcher in state machine approximation
dsyme Apr 28, 2019
07f9af0
butcher in state machine approximation
dsyme Apr 28, 2019
625170d
butcher code again for codegen approximation (does not run)
dsyme Apr 29, 2019
cd9f849
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 30, 2019
126a9cc
sketch of generalized state machine compilation
dsyme Apr 30, 2019
547c0e9
some codegen for state machine tasks
dsyme May 8, 2019
b9ed10c
more fixes to state machines
dsyme May 8, 2019
08363a7
state machines now work
dsyme May 9, 2019
d043d72
more examples - taskSeq and sync
dsyme May 10, 2019
90fef02
add seq2 { ... } example
dsyme May 10, 2019
e22648a
add seq2 { ... } example
dsyme May 10, 2019
94504fa
add list/array/rsarray example
dsyme May 10, 2019
949888f
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme May 13, 2019
27f5173
add perf tests
dsyme May 13, 2019
24c0962
revist perf
dsyme May 13, 2019
a7690e9
improve benchmarks
dsyme May 13, 2019
71a9d53
improve benchmarks
dsyme May 13, 2019
13bb169
remove unwrap
dsyme May 14, 2019
068ef95
merge master
dsyme May 15, 2019
e8bf0b9
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme May 17, 2019
58cf03b
struct state machines
dsyme May 17, 2019
f0f848e
struct state machines
dsyme May 17, 2019
17154b9
run perf benchmarks
cartermp May 14, 2019
b5101de
run perf benchmarks
dsyme May 17, 2019
8729822
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme May 20, 2019
3cf5a58
remove boxing of result
dsyme May 20, 2019
171c40b
update for code review
dsyme May 20, 2019
bbe118d
updates
dsyme May 20, 2019
12c3341
update
dsyme May 20, 2019
636f8f5
Merge branch 'proto' into tasks
dsyme May 20, 2019
37e9d39
fix incremental build
dsyme May 21, 2019
a0122d3
Merge branch 'inc4' into tasks
dsyme May 21, 2019
7625075
lift restriction on union cases in state machines
dsyme May 21, 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
36 changes: 36 additions & 0 deletions VisualFSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorialProject", "vsintegr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.Core.nuget", "src\fsharp\FSharp.Core.nuget\FSharp.Core.nuget.csproj", "{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Perf", "Perf", "{D3DE4E8F-DD05-4D58-BCFC-848988878640}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{E071023E-4D10-406F-9D31-0A02522D2779}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskPerfCSharp", "tests\fsharp\perf\tasks\CS\TaskPerfCSharp.csproj", "{218BD16B-D9BB-402A-970B-72A86E30AA41}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TaskPerf", "tests\fsharp\perf\tasks\FS\TaskPerf.fsproj", "{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -884,6 +892,30 @@ Global
{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}.Release|Any CPU.Build.0 = Release|Any CPU
{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}.Release|x86.ActiveCfg = Release|Any CPU
{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC}.Release|x86.Build.0 = Release|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Debug|x86.ActiveCfg = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Debug|x86.Build.0 = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Proto|Any CPU.Build.0 = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Proto|x86.ActiveCfg = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Proto|x86.Build.0 = Debug|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Release|Any CPU.Build.0 = Release|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Release|x86.ActiveCfg = Release|Any CPU
{218BD16B-D9BB-402A-970B-72A86E30AA41}.Release|x86.Build.0 = Release|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Debug|x86.ActiveCfg = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Debug|x86.Build.0 = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Proto|Any CPU.Build.0 = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Proto|x86.ActiveCfg = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Proto|x86.Build.0 = Debug|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Release|Any CPU.Build.0 = Release|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Release|x86.ActiveCfg = Release|Any CPU
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -956,6 +988,10 @@ Global
{C32806E0-71C2-40E4-AEC4-517F73F6A18A} = {BED74F9E-A0D2-48E2-9EE7-449832100487}
{7B345E51-F2C0-4D4B-B0E0-05432EC9D5E1} = {BED74F9E-A0D2-48E2-9EE7-449832100487}
{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC} = {647810D0-5307-448F-99A2-E83917010DAE}
{D3DE4E8F-DD05-4D58-BCFC-848988878640} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{E071023E-4D10-406F-9D31-0A02522D2779} = {D3DE4E8F-DD05-4D58-BCFC-848988878640}
{218BD16B-D9BB-402A-970B-72A86E30AA41} = {E071023E-4D10-406F-9D31-0A02522D2779}
{0018B20C-1AE7-4E81-8E9E-A273FCA10A70} = {E071023E-4D10-406F-9D31-0A02522D2779}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}
Expand Down
5 changes: 4 additions & 1 deletion src/fsharp/DotNetFrameworkDependencies.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies
let file =
try
let depsJsonPath = Path.ChangeExtension(Assembly.GetEntryAssembly().Location, "deps.json")
File.ReadAllText(depsJsonPath)
if File.Exists depsJsonPath then
File.ReadAllText(depsJsonPath)
else
""
with _ -> ""

let tfmPrefix=".NETCoreApp,Version=v"
Expand Down
8 changes: 7 additions & 1 deletion src/fsharp/FSharp.Core/FSharp.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">

Expand Down Expand Up @@ -170,6 +170,12 @@
<Compile Include="async.fs">
<Link>Control/async.fs</Link>
</Compile>
<Compile Include="tasks.fsi">
<Link>Control/tasks.fsi</Link>
</Compile>
<Compile Include="tasks.fs">
<Link>Control/tasks.fs</Link>
</Compile>
<Compile Include="eventmodule.fsi">
<Link>Control/eventmodule.fsi</Link>
</Compile>
Expand Down
Loading