Merge branch 'BigIntegerParse'

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

diff --git a/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeWithQualityHeaderValue.cs b/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeWithQualityHeaderValue.cs
index a3415fc1e1aaa42a4e9437f14f44338b5cba493b..1cf406dbfdc05efae168d768d44455884cb2a93c 100644 (file)
--- a/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeWithQualityHeaderValue.cs
+++ b/mcs/class/System.Net.Http/System.Net.Http.Headers/MediaTypeWithQualityHeaderValue.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 sealed class MediaTypeWithQualityHeaderValue : MediaTypeHeaderValue
@@ -65,7 +67,40 @@ namespace System.Net.Http.Headers
 
                public static bool TryParse (string input, out MediaTypeWithQualityHeaderValue parsedValue)
                {
-                       return TryParse (input, out parsedValue, () => new MediaTypeWithQualityHeaderValue ());
+                       var lexer = new Lexer (input);
+                       Token token;
+                       if (TryParseElement (lexer, out parsedValue, out token) && token == Token.Type.End)
+                               return true;
+
+                       parsedValue = null;
+                       return false;
+               }
+
+               static bool TryParseElement (Lexer lexer, out MediaTypeWithQualityHeaderValue parsedValue, out Token t)
+               {
+                       parsedValue = null;
+
+                       string media;
+                       List<NameValueHeaderValue> parameters = null;
+                       var token = TryParseMediaType (lexer, out media);
+                       if (token == null) {
+                               t = Token.Empty;
+                               return false;
+                       }
+
+                       t = token.Value;
+                       if (t == Token.Type.SeparatorSemicolon && (!NameValueHeaderValue.TryParseParameters (lexer, out parameters, out t) || t != Token.Type.End))
+                               return false;
+
+                       parsedValue = new MediaTypeWithQualityHeaderValue ();
+                       parsedValue.media_type = media;
+                       parsedValue.parameters = parameters;
+                       return true;
+               }
+
+               internal static bool TryParse (string input, int minimalCount, out List<MediaTypeWithQualityHeaderValue> result)
+               {
+                       return CollectionParser.TryParse (input, minimalCount, TryParseElement, out result);
                }
        }
 }