Merge pull request #3023 from lambdageek/dev/monoerror-minisig

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

diff --git a/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductHeaderValue.cs b/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductHeaderValue.cs
index 306c9f228c8679346692e5272c9a141e64de58bd..9614df12939009d8f476dbca0c6f8a8a1ec1b5fe 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductHeaderValue.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http.Headers/ProductHeaderValue.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 ProductHeaderValue : ICloneable
@@ -87,15 +89,30 @@ namespace System.Net.Http.Headers
 
                public static bool TryParse (string input, out ProductHeaderValue parsedValue)
                {
+                       var lexer = new Lexer (input);
+                       Token token;
+                       if (TryParseElement (lexer, out parsedValue, out token) && token == Token.Type.End)
+                               return true;
+
                        parsedValue = null;
+                       return false;
+               }
 
-                       var lexer = new Lexer (input);
-                       var t = lexer.Scan ();
+               internal static bool TryParse (string input, int minimalCount, out List<ProductHeaderValue> result)
+               {
+                       return CollectionParser.TryParse (input, minimalCount, TryParseElement, out result);
+               }
+
+               static bool TryParseElement (Lexer lexer, out ProductHeaderValue parsedValue, out Token t)
+               {
+                       parsedValue = null;
+
+                       t = lexer.Scan ();
                        if (t != Token.Type.Token)
                                return false;
 
-                       var value = new ProductHeaderValue ();
-                       value.Name = lexer.GetStringValue (t);
+                       parsedValue = new ProductHeaderValue ();
+                       parsedValue.Name = lexer.GetStringValue (t);
 
                        t = lexer.Scan ();
                        if (t == Token.Type.SeparatorSlash) {
@@ -103,14 +120,10 @@ namespace System.Net.Http.Headers
                                if (t != Token.Type.Token)
                                        return false;
 
-                               value.Version = lexer.GetStringValue (t);
+                               parsedValue.Version = lexer.GetStringValue (t);
                                t = lexer.Scan ();
                        }
 
-                       if (t != Token.Type.End)
-                               return false;
-
-                       parsedValue = value;
                        return true;
                }