Skip to content

Add parsing for function pointer types #39879

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

Merged
merged 7 commits into from
Nov 27, 2019
Merged

Add parsing for function pointer types #39879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e91c79e
Add parsing for function pointer types.
333fred Nov 19, 2019
f4ade3f
Address PR feedback. Make the parsing more resilient to bad input, an…
333fred Nov 20, 2019
23b046a
Make calling convention a standard IdentiferToken. Invalid convention…
333fred Nov 20, 2019
f8b708c
PR Feedback. Change FunctionPointerParameterOrReturnTypeSyntax to Mod…
333fred Nov 21, 2019
2eee516
Handle error recovery more gracefully in a few different error cases,…
333fred Nov 22, 2019
27e8523
PR feedback.
333fred Nov 26, 2019
3231dcc
Moved back to comparing Text, added a test to demonstrate behavior.
333fred Nov 26, 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
18 changes: 18 additions & 0 deletions src/Compilers/CSharp/Portable/CSharpResources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/Compilers/CSharp/Portable/CSharpResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5945,6 +5945,12 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
<data name="ERR_BadSwitchValue" xml:space="preserve">
<value>Command-line syntax error: '{0}' is not a valid value for the '{1}' option. The value must be of the form '{2}'.</value>
</data>
<data name="IDS_FeatureFunctionPointers" xml:space="preserve">
<value>function pointers</value>
</data>
<data name="ERR_InvalidFunctionPointerCallingConvention">
<value>'{0}' is not a valid calling convention for a function pointer. Valid conventions are 'cdecl', 'managed', 'unmanaged', 'thiscall', and 'stdcall'.</value>
</data>
<data name="ERR_InternalError" xml:space="preserve">
<value>Internal error in the C# compiler.</value>
</data>
Expand Down
6 changes: 6 additions & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,12 @@ internal enum ErrorCode

ERR_InternalError = 8751,

#region diagnostics introduced in preview

ERR_InvalidFunctionPointerCallingConvention = 8752,

#endregion

// Note: you will need to re-generate compiler code after adding warnings (eng\generate-compiler-code.cmd)
}
}
2 changes: 2 additions & 0 deletions src/Compilers/CSharp/Portable/Errors/MessageID.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ internal enum MessageID
IDS_FeatureSwitchExpression = MessageBase + 12763,
IDS_FeatureAsyncUsing = MessageBase + 12764,
IDS_FeatureLambdaDiscardParameters = MessageBase + 12765,
IDS_FeatureFunctionPointers = MessageBase + 12766,
}

// Message IDs may refer to strings that need to be localized.
Expand Down Expand Up @@ -293,6 +294,7 @@ internal static LanguageVersion RequiredVersion(this MessageID feature)
{
// Preview features.
case MessageID.IDS_FeatureLambdaDiscardParameters: // semantic check
case MessageID.IDS_FeatureFunctionPointers:
return LanguageVersion.Preview;

// C# 8.0 features.
Expand Down
9 changes: 9 additions & 0 deletions src/Compilers/CSharp/Portable/Generated/CSharp.Generated.g4
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading