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

Jump to bottom

Features/local functions prototype #4940

Merged
merged 61 commits into from
Sep 16, 2015
Merged

Features/local functions prototype #4940

merged 61 commits into from
Sep 16, 2015

Conversation

gafter
Copy link
Member

@gafter gafter commented Sep 2, 2015

This is a PR for integrating @khyperia's implementation of local functions into the future branch.

@AlekseyTs @jaredpar @VSadov @agocke I need one more reviewer for this code, please.

Evan Hauck and others added 30 commits June 8, 2015 09:02
Start work on local functions
0067749
Local functions 'Hello, World!'
927b461
More local function features working
388d11a
Make local functions use lambda closure machenery
b0de720
Support recursive closures
fea05ad
Change LocalFunctionMethodSymbol base class to MethodSymbol
ab32bbf
Improved parsing and IDE experience
2d0272a
Enable feature flag for local functions
1d8c2c8
Allow unsafe local functions
a673936
Fix CallerMemberNameAttribute
8ffeb31
Respond to local functions feedback
2b47dc5
@khyperia
Merge pull request #3372 from khyperia/LocalFunctions
7b4911e 
Local functions
Add documentation for local function branch
e771b51
@khyperia
Merge pull request #3534 from dotnet/future
d59050a 
Merge future into features/local-functions
@khyperia
Merge pull request #3460 from khyperia/LocalFunctionsDocs
47ad825 
Add documentation for local functions branch
Merge remote-tracking branch 'upstream/future' into features-local-fu…
f507de4 
…nctions
Allow generic local functions
ef76ee1
Small features and bugfixes in local functions
f1d923e 
Definite assignment, generic iterators, symbol display, and parser fixes
Syntax-related bugfixes
20af771
Initial EnC working for local functions
6f09a77
Fix parsing bug and parameter binding bug in speculative contexts
4518a58
Inferred return types for local functions
ef9cedd
Change local function mangled name to be separate from lambdas
f18e7aa
@khyperia
Merge pull request #3591 from khyperia/LocalFunctions
42d71a8 
Local functions update (generics)
Make generic local functions work in EE
646459e
Handle 'async var' and 'iterator var'
ead6aec
Fix type parameter name conflict diagnostic
b3c30d9
Implement generic constraints
b083c6a
Update local-functions design document
7bb4cd1
Refactor local function tests for smaller individual tests
21fe558
Evan Hauck and others added 9 commits July 16, 2015 08:31
Merge branch 'future' into 'features/local-functions'
7b4098f 
Conflicts:
	src/Compilers/CSharp/Portable/Errors/MessageID.cs
	src/Compilers/CSharp/Portable/Lowering/AsyncRewriter/AsyncMethodToStateMachineRewriter.cs
	src/Compilers/CSharp/Portable/Lowering/LambdaRewriter/LambdaRewriter.cs
	src/Features/CSharp/EditAndContinue/StatementSyntaxComparer.cs
Implement by-ref struct closure optimization
fed6600
Struct closures can be generic
7267116
@khyperia
Merge pull request #4082 from khyperia/LocalFunctionsStruct
ad5965d 
Local functions update: By-ref struct closures
Merge branch 'future' into 'features/local-functions'
3cb0e07 
Conflicts:
	src/Compilers/CSharp/Portable/CSharpResources.resx
	src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs
	src/Compilers/CSharp/Portable/Errors/MessageID.cs
	src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEntryPointSymbol.cs
Report unused local functions in switch statements
738fa9a
Minor locfunc bugfixes
4cfc5b0
Add documentation to var return types being broken
34089af
@khyperia
Merge pull request #4260 from khyperia/LocalFunctions
52ab4ce 
Local functions update: Bugfixes and documentation
@gafter
Copy link
Member Author

gafter commented Sep 2, 2015

I'll bring this up-to-date with the future branch shortly and squash the history.

@gafter
Copy link
Member Author

gafter commented Sep 2, 2015

/cc @jaredpar @AlekseyTs @VSadov @agocke @khyperia @gafter

Although there are some issues that we had wanted to revisit based on the design review (definite assignment, for example) I believe this is close enough to what we want that we should integrate it into the future branch.

@gafter gafter modified the milestones: 2.0, C# 7 and VB 15 Sep 2, 2015
@gafter gafter self-assigned this Sep 2, 2015
@gafter
Merge branch 'future' of https://github.com/dotnet/roslyn into featur…
e75ca21 
…es/local-functions

Conflicts:
	src/Compilers/CSharp/Portable/CSharpResources.resx
	src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
	src/Compilers/CSharp/Portable/FlowAnalysis/FlowAnalysisPass.cs
	src/Compilers/CSharp/Portable/Lowering/LambdaRewriter/LambdaCapturedVariable.cs
	src/Compilers/CSharp/Portable/Lowering/LambdaRewriter/LambdaRewriter.cs
	src/Compilers/CSharp/Portable/PublicAPI.txt
	src/Compilers/CSharp/Portable/Symbols/TypeMap.cs
	src/Compilers/Core/Portable/PublicAPI.txt
	src/Features/CSharp/CSharpFeaturesResources.Designer.cs
	src/Features/CSharp/CSharpFeaturesResources.resx
	src/Features/CSharp/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
@gafter
Fix some merge issues.
b8e0bf2
@gafter
Further integration fixes.
065dfb5
@gafter
Merge branch 'future' of https://github.com/dotnet/roslyn into featur…
3f5eaf2 
…es/local-functions
@gafter
Copy link
Member Author

gafter commented Sep 11, 2015

@AlekseyTs @jaredpar @VSadov @agocke I need one more reviewer for this code, please. Once this is pulled into the future branch, there will be a small number of issues opened against the feature for design changes (return type var inference will probably be removed; also definite assignment changes. These are discussed in the included documentation).

@tmat
Copy link
Member

tmat commented Sep 11, 2015

@gafter Please, also file an issue to implement and test Edit and Continue and EE support as well as testing in interactive context. I suspect EnC and EE work items to be a non-trivial.

@gafter
Copy link
Member Author

gafter commented Sep 11, 2015

@tmat done, in #5156 and #5157.

@gafter
Copy link
Member Author

gafter commented Sep 11, 2015

@dotnet-bot test this please

@agocke
Copy link
Member

agocke commented Sep 11, 2015

Can we file a bug to remove or fix var? I don't want that to get dropped on the floor. Otherwise, 👍

@gafter
Copy link
Member Author

gafter commented Sep 11, 2015

@agocke Filed #5168 for that.

gafter added a commit that referenced this pull request Sep 16, 2015
@gafter
Merge pull request #4940 from dotnet/features/local-functions
6e2f6c6 
Features/local functions prototype
@gafter gafter merged commit 6e2f6c6 into future Sep 16, 2015
@gafter gafter modified the milestone: C# 7 and VB 15 Nov 26, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gafter gafter

Labels
cla-already-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gafter @tmat @agocke @dnfclas @khyperia