Skip to content

Commit 1f0d02f

Browse files
committed
Merge remote-tracking branch 'origin/features/param-nullchecking' into merges/master-to-features/param-nullchecking
2 parents 47d094b + 650a8d7 commit 1f0d02f

28 files changed

+1452
-67
lines changed

docs/features/DefaultInterfaceImplementation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ II.10.4 Method implementat ion requirements
134134
II.12 Semantics of interfaces
135135
Interfaces can have static fields and methods, but they shall not have instance fields or
136136
methods. Interfaces can define virtual methods, but only if those methods are abstract
137-
(see Partition I and §II.15.4.2.4).
137+
(see Partition I and II.15.4.2.4).
138138
II.12.2 Implement ing virtual methods on interfaces
139139
If the class defines any public virtual methods whose name and signature
140140
match a virtual method on the interface, then add these to the list for that
@@ -149,7 +149,7 @@ It follows that instance methods shall only be defined in classes or value types
149149
but not in interfaces or outside of a type (i.e., globally).
150150
II.22.27 MethodImpl : 0x19
151151
The method indexed by MethodBody shall be a member of Class or some base class
152-
of Class (MethodImpls do not allow compilers to hook arbitrary method bodies)
152+
of Class (MethodImpls do not allow compilers to hook arbitrary method bodies)
153153
II.22.37 TypeDef : 0x02
154154
All of the methods owned by an Interface (Flags.Interface = 1) shall be abstract
155155
(Flags.Abstract = 1)

src/Compilers/CSharp/Portable/CSharpResources.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Compilers/CSharp/Portable/CSharpResources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5898,4 +5898,7 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
58985898
<data name="IDS_FeatureNestedStackalloc" xml:space="preserve">
58995899
<value>stackalloc in nested expressions</value>
59005900
</data>
5901+
<data name="ERR_NeedSpaceBetweenExclamationAndEquals" xml:space="preserve">
5902+
<value>Space required between '!' and '=' here.</value>
5903+
</data>
59015904
</root>

src/Compilers/CSharp/Portable/Errors/ErrorCode.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,6 +1719,7 @@ internal enum ErrorCode
17191719

17201720
ERR_DefaultInterfaceImplementationInNoPIAType = 8711,
17211721
ERR_AbstractEventHasAccessors = 8712,
1722+
ERR_NeedSpaceBetweenExclamationAndEquals = 8713,
17221723

17231724
#endregion diagnostics introduced for C# 8.0
17241725

src/Compilers/CSharp/Portable/Generated/Syntax.xml.Internal.Generated.cs

Lines changed: 66 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Compilers/CSharp/Portable/Generated/Syntax.xml.Main.Generated.cs

Lines changed: 19 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)