Skip to content

Commit 4b8af5a

Browse files
WhiteBlackGooseWhiteBlackGoose
committed
Names -> Keywords
Replacing full type names with keywords when appropriate Files affected: Parsing.cs, Persistence.cs. See dotnet#6920
1 parent 9914215 commit 4b8af5a

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎samples/snippets/csharp/System.DateTime/Parsing.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33

44
namespace SystemDateTimeReference
@@ -19,22 +19,22 @@ private static void ParseStandardFormats()
1919
System.Globalization.CultureInfo.CreateSpecificCulture("en-GB");
2020

2121
var date1 = new DateTime(2013, 6, 1, 12, 32, 30);
22-
var badFormats = new List<String>();
22+
var badFormats = new List<string>();
2323

24-
Console.WriteLine($"{"Date String",-37} {"Date",-19}\n");
25-
foreach (var dateString in date1.GetDateTimeFormats())
24+
Console.WriteLine($"{"Date string",-37} {"Date",-19}\n");
25+
foreach (var datestring in date1.GetDateTimeFormats())
2626
{
2727
DateTime parsedDate;
28-
if (DateTime.TryParse(dateString, out parsedDate))
29-
Console.WriteLine($"{dateString,-37} {DateTime.Parse(dateString),-19}");
28+
if (DateTime.TryParse(datestring, out parsedDate))
29+
Console.WriteLine($"{datestring,-37} {DateTime.Parse(datestring),-19}");
3030
else
31-
badFormats.Add(dateString);
31+
badFormats.Add(datestring);
3232
}
3333

3434
// Display strings that could not be parsed.
3535
if (badFormats.Count > 0)
3636
{
37-
Console.WriteLine("\nStrings that could not be parsed: ");
37+
Console.WriteLine("\nstrings that could not be parsed: ");
3838
foreach (var badFormat in badFormats)
3939
Console.WriteLine($" {badFormat}");
4040
}
@@ -46,19 +46,19 @@ private static void ParseCustomFormats()
4646
{
4747
// <Snippet2>
4848
string[] formats = { "yyyyMMdd", "HHmmss" };
49-
string[] dateStrings = { "20130816", "20131608", " 20130816 ",
49+
string[] datestrings = { "20130816", "20131608", " 20130816 ",
5050
"115216", "521116", " 115216 " };
5151
DateTime parsedDate;
5252

53-
foreach (var dateString in dateStrings)
53+
foreach (var datestring in datestrings)
5454
{
55-
if (DateTime.TryParseExact(dateString, formats, null,
55+
if (DateTime.TryParseExact(datestring, formats, null,
5656
System.Globalization.DateTimeStyles.AllowWhiteSpaces |
5757
System.Globalization.DateTimeStyles.AdjustToUniversal,
5858
out parsedDate))
59-
Console.WriteLine($"{dateString} --> {parsedDate:g}");
59+
Console.WriteLine($"{datestring} --> {parsedDate:g}");
6060
else
61-
Console.WriteLine($"Cannot convert {dateString}");
61+
Console.WriteLine($"Cannot convert {datestring}");
6262
}
6363
// The example displays the following output:
6464
// 20130816 --> 8/16/2013 12:00 AM
@@ -72,10 +72,10 @@ private static void ParseCustomFormats()
7272
private static void ParseISO8601()
7373
{
7474
// <Snippet3>
75-
var iso8601String = "20080501T08:30:52Z";
76-
DateTime dateISO8602 = DateTime.ParseExact(iso8601String, "yyyyMMddTHH:mm:ssZ",
75+
var iso8601string = "20080501T08:30:52Z";
76+
DateTime dateISO8602 = DateTime.ParseExact(iso8601string, "yyyyMMddTHH:mm:ssZ",
7777
System.Globalization.CultureInfo.InvariantCulture);
78-
Console.WriteLine($"{iso8601String} --> {dateISO8602:g}");
78+
Console.WriteLine($"{iso8601string} --> {dateISO8602:g}");
7979
// </Snippet3>
8080
}
8181
}

‎samples/snippets/csharp/System.DateTime/Persistence.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using DateTimeExtensions;
1+
using DateTimeExtensions;
22
using System;
33
using System.Collections.Generic;
44
using System.Globalization;
@@ -17,9 +17,9 @@ public static class Persistence
1717
public static void Snippets()
1818
{
1919
File.Delete(filenameTxt);
20-
PersistAsLocalStrings();
20+
PersistAsLocalstrings();
2121
File.Delete(filenameTxt);
22-
PersistAsInvariantStrings();
22+
PersistAsInvariantstrings();
2323
File.Delete(filenameTxt);
2424

2525
File.Delete(filenameInts);
@@ -39,13 +39,13 @@ public static void Snippets()
3939
}
4040

4141
// <Snippet1>
42-
public static void PersistAsLocalStrings()
42+
public static void PersistAsLocalstrings()
4343
{
44-
SaveLocalDatesAsString();
45-
RestoreLocalDatesFromString();
44+
SaveLocalDatesAsstring();
45+
RestoreLocalDatesFromstring();
4646
}
4747

48-
private static void SaveLocalDatesAsString()
48+
private static void SaveLocalDatesAsstring()
4949
{
5050
DateTime[] dates = { new DateTime(2014, 6, 14, 6, 32, 0),
5151
new DateTime(2014, 7, 10, 23, 49, 0),
@@ -58,23 +58,23 @@ private static void SaveLocalDatesAsString()
5858
Console.WriteLine($"The dates on an {Thread.CurrentThread.CurrentCulture.Name} system:");
5959
for (int ctr = 0; ctr < dates.Length; ctr++)
6060
{
61-
Console.WriteLine(dates[ctr].ToString("f"));
62-
output += dates[ctr].ToString() + (ctr != dates.Length - 1 ? "|" : "");
61+
Console.WriteLine(dates[ctr].Tostring("f"));
62+
output += dates[ctr].Tostring() + (ctr != dates.Length - 1 ? "|" : "");
6363
}
6464
var sw = new StreamWriter(filenameTxt);
6565
sw.Write(output);
6666
sw.Close();
6767
Console.WriteLine("Saved dates...");
6868
}
6969

70-
private static void RestoreLocalDatesFromString()
70+
private static void RestoreLocalDatesFromstring()
7171
{
7272
TimeZoneInfo.ClearCachedData();
7373
Console.WriteLine($"Current Time Zone: {TimeZoneInfo.Local.DisplayName}");
7474
Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-GB");
7575
StreamReader sr = new StreamReader(filenameTxt);
7676
string[] inputValues = sr.ReadToEnd().Split(new char[] { '|' },
77-
StringSplitOptions.RemoveEmptyEntries);
77+
stringSplitOptions.RemoveEmptyEntries);
7878
sr.Close();
7979
Console.WriteLine("The dates on an {0} system:",
8080
Thread.CurrentThread.CurrentCulture.Name);
@@ -114,13 +114,13 @@ private static void RestoreLocalDatesFromString()
114114
// </Snippet1>
115115

116116
// <Snippet2>
117-
public static void PersistAsInvariantStrings()
117+
public static void PersistAsInvariantstrings()
118118
{
119-
SaveDatesAsInvariantStrings();
120-
RestoreDatesAsInvariantStrings();
119+
SaveDatesAsInvariantstrings();
120+
RestoreDatesAsInvariantstrings();
121121
}
122122

123-
private static void SaveDatesAsInvariantStrings()
123+
private static void SaveDatesAsInvariantstrings()
124124
{
125125
DateTime[] dates = { new DateTime(2014, 6, 14, 6, 32, 0),
126126
new DateTime(2014, 7, 10, 23, 49, 0),
@@ -133,8 +133,8 @@ private static void SaveDatesAsInvariantStrings()
133133
Console.WriteLine($"The dates on an {Thread.CurrentThread.CurrentCulture.Name} system:");
134134
for (int ctr = 0; ctr < dates.Length; ctr++)
135135
{
136-
Console.WriteLine(dates[ctr].ToString("f"));
137-
output += dates[ctr].ToUniversalTime().ToString("O", CultureInfo.InvariantCulture)
136+
Console.WriteLine(dates[ctr].Tostring("f"));
137+
output += dates[ctr].ToUniversalTime().Tostring("O", CultureInfo.InvariantCulture)
138138
+ (ctr != dates.Length - 1 ? "|" : "");
139139
}
140140
var sw = new StreamWriter(filenameTxt);
@@ -143,15 +143,15 @@ private static void SaveDatesAsInvariantStrings()
143143
Console.WriteLine("Saved dates...");
144144
}
145145

146-
private static void RestoreDatesAsInvariantStrings()
146+
private static void RestoreDatesAsInvariantstrings()
147147
{
148148
TimeZoneInfo.ClearCachedData();
149149
Console.WriteLine("Current Time Zone: {0}",
150150
TimeZoneInfo.Local.DisplayName);
151151
Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-GB");
152152
StreamReader sr = new StreamReader(filenameTxt);
153153
string[] inputValues = sr.ReadToEnd().Split(new char[] { '|' },
154-
StringSplitOptions.RemoveEmptyEntries);
154+
stringSplitOptions.RemoveEmptyEntries);
155155
sr.Close();
156156
Console.WriteLine("The dates on an {0} system:",
157157
Thread.CurrentThread.CurrentCulture.Name);
@@ -213,7 +213,7 @@ private static void SaveDatesAsInts()
213213
var ticks = new long[dates.Length];
214214
for (int ctr = 0; ctr < dates.Length; ctr++)
215215
{
216-
Console.WriteLine(dates[ctr].ToString("f"));
216+
Console.WriteLine(dates[ctr].Tostring("f"));
217217
ticks[ctr] = dates[ctr].ToUniversalTime().Ticks;
218218
}
219219
var fs = new FileStream(filenameInts, FileMode.Create);
@@ -238,7 +238,7 @@ private static void RestoreDatesAsInts()
238238

239239
try
240240
{
241-
items = br.ReadInt32();
241+
items = br.Readint();
242242
dates = new DateTime[items];
243243

244244
for (int ctr = 0; ctr < items; ctr++)
@@ -270,7 +270,7 @@ private static void RestoreDatesAsInts()
270270

271271
Console.WriteLine($"The dates on an {Thread.CurrentThread.CurrentCulture.Name} system:");
272272
foreach (var value in dates)
273-
Console.WriteLine(value.ToString("f"));
273+
Console.WriteLine(value.Tostring("f"));
274274

275275
Console.WriteLine("Restored dates...");
276276
}
@@ -375,7 +375,7 @@ private static void SaveDatesBinary()
375375
Console.WriteLine($"The dates on an {Thread.CurrentThread.CurrentCulture.Name} system:");
376376
for (int ctr = 0; ctr < dates.Length; ctr++)
377377
{
378-
Console.WriteLine(dates[ctr].ToString("f"));
378+
Console.WriteLine(dates[ctr].Tostring("f"));
379379
dates[ctr] = dates[ctr].ToUniversalTime();
380380
}
381381
bin.Serialize(fs, dates);
@@ -396,7 +396,7 @@ private static void RestoreDatesBinary()
396396

397397
Console.WriteLine($"The dates on an {Thread.CurrentThread.CurrentCulture.Name} system:");
398398
foreach (var value in dates)
399-
Console.WriteLine(value.ToLocalTime().ToString("f"));
399+
Console.WriteLine(value.ToLocalTime().Tostring("f"));
400400

401401
Console.WriteLine("Restored dates...");
402402
}

0 commit comments

Comments
 (0)