corrade-vassal – Diff between revs 14 and 16

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 14 Rev 16
1 /////////////////////////////////////////////////////////////////////////// 1 ///////////////////////////////////////////////////////////////////////////
2 // Copyright (C) Wizardry and Steamworks 2013 - License: GNU GPLv3 // 2 // Copyright (C) Wizardry and Steamworks 2013 - License: GNU GPLv3 //
3 // Please see: http://www.gnu.org/licenses/gpl.html for legal details, // 3 // Please see: http://www.gnu.org/licenses/gpl.html for legal details, //
4 // rights of fair usage, the disclaimer and warranty conditions. // 4 // rights of fair usage, the disclaimer and warranty conditions. //
5 /////////////////////////////////////////////////////////////////////////// 5 ///////////////////////////////////////////////////////////////////////////
6   -  
7 using System; 6  
8 using System.Collections.Generic; 7 using System.Collections.Generic;
9 using System.Linq; -  
10 using System.Linq.Expressions; 8 using System.Linq;
11 using System.Text; 9 using System.Text;
12   10  
13 namespace wasSharp 11 namespace wasSharp
14 { 12 {
15 public class CSV 13 public static class CSV
16 { 14 {
17 /////////////////////////////////////////////////////////////////////////// 15 ///////////////////////////////////////////////////////////////////////////
18 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 16 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
19 /////////////////////////////////////////////////////////////////////////// 17 ///////////////////////////////////////////////////////////////////////////
20 /// <summary> 18 /// <summary>
21 /// Converts a list of strings to a comma-separated values string. 19 /// Converts a list of strings to a comma-separated values string.
22 /// </summary> 20 /// </summary>
23 /// <returns>a commma-separated list of values</returns> 21 /// <returns>a commma-separated list of values</returns>
24 /// <remarks>compliant with RFC 4180</remarks> 22 /// <remarks>compliant with RFC 4180</remarks>
25 public static Func<IEnumerable<string>, string> FromEnumerable = 23 public static string FromEnumerable(IEnumerable<string> input)
-   24 {
26 ((Expression<Func<IEnumerable<string>, string>>) (data => string.Join(",", 25 return string.Join(",",
27 data 26 input
28 .Select(o => o.Replace("\"", "\"\"")) 27 .Select(o => o.Replace("\"", "\"\""))
29 .Select(o => o.IndexOfAny(new[] {'"', ' ', ',', '\r', '\n'}).Equals(-1) ? o : "\"" + o + "\"")))) 28 .Select(o => o.IndexOfAny(new[] {'"', ' ', ',', '\r', '\n'}).Equals(-1) ? o : "\"" + o + "\""));
-   29 }
-   30  
-   31 ///////////////////////////////////////////////////////////////////////////
-   32 // Copyright (C) 2016 Wizardry and Steamworks - License: GNU GPLv3 //
-   33 ///////////////////////////////////////////////////////////////////////////
-   34 /// <summary>
-   35 /// Converts a dictionary of strings to a comma-separated values string.
-   36 /// </summary>
-   37 /// <returns>a commma-separated list of values</returns>
-   38 /// <remarks>compliant with RFC 4180</remarks>
-   39 public static string FromDictionary(Dictionary<string, string> input)
-   40 {
-   41 return string.Join(",", input.Keys.Zip(input.Values,
30 .Compile(); 42 (o, p) =>
-   43 string.Join(",",
-   44 o.Replace("\"", "\"\"").IndexOfAny(new[] {'"', ' ', ',', '\r', '\n'}).Equals(-1)
-   45 ? o
-   46 : "\"" + o + "\"",
-   47 p.Replace("\"", "\"\"").IndexOfAny(new[] {'"', ' ', ',', '\r', '\n'}).Equals(-1)
-   48 ? p
-   49 : "\"" + p + "\"")));
-   50 }
31   51  
32 /////////////////////////////////////////////////////////////////////////// 52 ///////////////////////////////////////////////////////////////////////////
33 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 53 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
34 /////////////////////////////////////////////////////////////////////////// 54 ///////////////////////////////////////////////////////////////////////////
35 /// <summary> 55 /// <summary>
36 /// Converts successive comma-separated values to key-value pairs. 56 /// Converts successive comma-separated values to key-value pairs.
37 /// </summary> 57 /// </summary>
38 /// <returns>key-value pairs of successive comma-separate values</returns> 58 /// <returns>key-value pairs of successive comma-separate values</returns>
39 public static Func<string, IEnumerable<KeyValuePair<string, string>>> ToKeyValue = 59 public static IEnumerable<KeyValuePair<string, string>> ToKeyValue(string input)
40 ((Expression<Func<string, IEnumerable<KeyValuePair<string, string>>>>) 60 {
41 (csv => ToEnumerable(csv).AsParallel().Select((o, p) => new {o, p}) 61 return ToEnumerable(input).AsParallel().Select((o, p) => new {o, p})
42 .GroupBy(q => q.p/2, q => q.o) 62 .GroupBy(q => q.p/2, q => q.o)
43 .Select(o => o.ToArray()) 63 .Select(o => o.ToArray())
44 .TakeWhile(o => o.Length%2 == 0) 64 .TakeWhile(o => o.Length%2 == 0)
45 .Where(o => !string.IsNullOrEmpty(o[0]) || !string.IsNullOrEmpty(o[1])) 65 .Where(o => !string.IsNullOrEmpty(o[0]) || !string.IsNullOrEmpty(o[1]))
46 .ToDictionary(o => o[0], p => p[1]).Select(o => o))).Compile(); 66 .ToDictionary(o => o[0], p => p[1]).Select(o => o);
-   67 }
47   68  
48 /////////////////////////////////////////////////////////////////////////// 69 ///////////////////////////////////////////////////////////////////////////
49 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 // 70 // Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3 //
50 /////////////////////////////////////////////////////////////////////////// 71 ///////////////////////////////////////////////////////////////////////////
51 /// <summary> 72 /// <summary>
52 /// Converts a comma-separated list of values to a list of strings. 73 /// Converts a comma-separated list of values to a list of strings.
53 /// </summary> 74 /// </summary>
54 /// <param name="csv">a comma-separated list of values</param> 75 /// <param name="csv">a comma-separated list of values</param>
55 /// <returns>a list of strings</returns> 76 /// <returns>a list of strings</returns>
56 /// <remarks>compliant with RFC 4180</remarks> 77 /// <remarks>compliant with RFC 4180</remarks>
57 public static IEnumerable<string> ToEnumerable(string csv) 78 public static IEnumerable<string> ToEnumerable(string csv)
58 { 79 {
59 Stack<char> s = new Stack<char>(); 80 var s = new Stack<char>();
60 StringBuilder m = new StringBuilder(); 81 var m = new StringBuilder();
61 for (int i = 0; i < csv.Length; ++i) 82 for (var i = 0; i < csv.Length; ++i)
62 { 83 {
63 switch (csv[i]) 84 switch (csv[i])
64 { 85 {
65 case ',': 86 case ',':
66 if (!s.Any() || !s.Peek().Equals('"')) 87 if (!s.Any() || !s.Peek().Equals('"'))
67 { 88 {
68 yield return m.ToString(); 89 yield return m.ToString();
69 m = new StringBuilder(); 90 m = new StringBuilder();
70 continue; 91 continue;
71 } 92 }
72 m.Append(csv[i]); 93 m.Append(csv[i]);
73 continue; 94 continue;
74 case '"': 95 case '"':
75 if (i + 1 < csv.Length && csv[i].Equals(csv[i + 1])) 96 if (i + 1 < csv.Length && csv[i].Equals(csv[i + 1]))
76 { 97 {
77 m.Append(csv[i]); 98 m.Append(csv[i]);
78 ++i; 99 ++i;
79 continue; 100 continue;
80 } 101 }
81 if (!s.Any() || !s.Peek().Equals(csv[i])) 102 if (!s.Any() || !s.Peek().Equals(csv[i]))
82 { 103 {
83 s.Push(csv[i]); 104 s.Push(csv[i]);
84 continue; 105 continue;
85 } 106 }
86 s.Pop(); 107 s.Pop();
87 continue; 108 continue;
88 } 109 }
89 m.Append(csv[i]); 110 m.Append(csv[i]);
90 } 111 }
91   112  
92 yield return m.ToString(); 113 yield return m.ToString();
93 } 114 }
94 } 115 }
95 } 116 }
96   117  
97
Generated by GNU Enscript 1.6.5.90.
 118
Generated by GNU Enscript 1.6.5.90.
98   119  
99   120  
100   121