Merge pull request #900 from Blewzman/FixAggregateExceptionGetBaseException

[mono.git] / mcs / class / System.Net.Http / System.Net.Http.Headers / ProductInfoHeaderValue.cs

diff --git a/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductInfoHeaderValue.cs b/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductInfoHeaderValue.cs
index 0c4d12802a9ad8af0c784220ceb84e65ec01ac24..baace53ed8e9c1d8098ab24653473c5fdf2eda1f 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductInfoHeaderValue.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductInfoHeaderValue.cs
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System.Collections.Generic;
+
 namespace System.Net.Http.Headers
 {
        public class ProductInfoHeaderValue : ICloneable
@@ -93,9 +95,48 @@ namespace System.Net.Http.Headers
                        parsedValue = null;
 
                        var lexer = new Lexer (input);
+                       if (!TryParseElement (lexer, out parsedValue) || parsedValue == null)
+                               return false;
+
+                       if (lexer.Scan () != Token.Type.End) {
+                               parsedValue = null;
+                               return false;
+                       }       
+
+                       return true;
+               }
+
+               internal static bool TryParse (string input, int minimalCount, out List<ProductInfoHeaderValue> result)
+               {
+                       var list = new List<ProductInfoHeaderValue> ();
+                       var lexer = new Lexer (input);
+                       result = null;
+
+                       while (true) {
+                               ProductInfoHeaderValue element;
+                               if (!TryParseElement (lexer, out element))
+                                       return false;
+
+                               if (element == null) {
+                                       if (list != null && minimalCount <= list.Count) {
+                                               result = list;
+                                               return true;
+                                       }
+
+                                       return false;
+                               }
+
+                               list.Add (element);
+                       }
+               }
+
+               static bool TryParseElement (Lexer lexer, out ProductInfoHeaderValue parsedValue)
+               {
                        string comment;
+                       parsedValue = null;
+                       Token t;
 
-                       if (lexer.ScanCommentOptional (out comment)) {
+                       if (lexer.ScanCommentOptional (out comment, out t)) {
                                if (comment == null)
                                        return false;
 
@@ -104,11 +145,25 @@ namespace System.Net.Http.Headers
                                return true;
                        }
 
-                       ProductHeaderValue res;
-                       if (!ProductHeaderValue.TryParse (input, out res))
+                       if (t == Token.Type.End)
+                               return true;
+
+                       if (t != Token.Type.Token)
                                return false;
 
-                       parsedValue = new ProductInfoHeaderValue (res);
+                       var value = new ProductHeaderValue ();
+                       value.Name = lexer.GetStringValue (t);
+
+                       t = lexer.Scan ();
+                       if (t == Token.Type.SeparatorSlash) {
+                               t = lexer.Scan ();
+                               if (t != Token.Type.Token)
+                                       return false;
+
+                               value.Version = lexer.GetStringValue (t);
+                       }
+
+                       parsedValue = new ProductInfoHeaderValue (value);
                        return true;
                }