Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update new String.Split methods to use optional params #7175

Merged
jkotas merged 1 commit into from
Sep 14, 2016
Merged

Update new String.Split methods to use optional params #7175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/mscorlib/model.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7123,14 +7123,12 @@
<Member Name="Remove(System.Int32,System.Int32)" />
<Member Name="Replace(System.Char,System.Char)" />
<Member Name="Replace(System.String,System.String)" />
<Member Name="Split(System.Char)" />
<Member Name="Split(System.Char,System.Int32,System.StringSplitOptions)" />
<Member Name="Split(System.Char,System.StringSplitOptions)"/>
<Member Name="Split(System.Char[])" />
<Member Name="Split(System.Char[],System.Int32)" />
<Member Name="Split(System.Char[],System.Int32,System.StringSplitOptions)" />
<Member Name="Split(System.Char[],System.StringSplitOptions)"/>
<Member Name="Split(System.String)" />
<Member Name="Split(System.String,System.Int32,System.StringSplitOptions)" />
<Member Name="Split(System.String,System.StringSplitOptions)"/>
<Member Name="Split(System.String[],System.Int32,System.StringSplitOptions)" />
Expand Down
20 changes: 4 additions & 16 deletions src/mscorlib/src/System/String.Manipulation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,19 +944,13 @@ public String Replace(String oldValue, String newValue)
}

[ComVisible(false)]
public String[] Split(char separator) {
Contract.Ensures(Contract.Result<String[]>() != null);
return SplitInternal(separator, Int32.MaxValue, StringSplitOptions.None);
}

[ComVisible(false)]
public String[] Split(char separator, StringSplitOptions options) {
public String[] Split(char separator, StringSplitOptions options = StringSplitOptions.None) {
Contract.Ensures(Contract.Result<String[]>() != null);
return SplitInternal(separator, Int32.MaxValue, options);
}

[ComVisible(false)]
public String[] Split(char separator, int count, StringSplitOptions options) {
public String[] Split(char separator, int count, StringSplitOptions options = StringSplitOptions.None) {
Contract.Ensures(Contract.Result<String[]>() != null);
return SplitInternal(separator, count, options);
}
Expand Down Expand Up @@ -1075,19 +1069,13 @@ private unsafe String[] SplitInternal(char* separators, int separatorsLength, in
}

[ComVisible(false)]
public String[] Split(String separator) {
Contract.Ensures(Contract.Result<String[]>() != null);
return SplitInternal(separator ?? String.Empty, null, Int32.MaxValue, StringSplitOptions.None);
}

[ComVisible(false)]
public String[] Split(String separator, StringSplitOptions options) {
public String[] Split(String separator, StringSplitOptions options = StringSplitOptions.None) {
Contract.Ensures(Contract.Result<String[]>() != null);
return SplitInternal(separator ?? String.Empty, null, Int32.MaxValue, options);
}

[ComVisible(false)]
public String[] Split(String separator, Int32 count, StringSplitOptions options) {
public String[] Split(String separator, Int32 count, StringSplitOptions options = StringSplitOptions.None) {
Contract.Ensures(Contract.Result<String[]>() != null);
return SplitInternal(separator ?? String.Empty, null, count, options);
}
Expand Down