Fix some bugs in the Uri class

sdk/lib/core/uri.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.core;
 
 /**
  * A parsed URI, as specified by RFC-3986, http://tools.ietf.org/html/rfc3986.
  */
 class Uri {
@@ skipping 165 matching lines @@
   /*
    * Returns the URI query split into a map according to the rules
    * specified for FORM post in the HTML 4.01 specification. Each key
    * and value in the returned map have been decoded. If there is no
    * query the empty map will be returned.
    */
   Map<String, String> get queryParameters {
     return query.split("&").fold({}, (map, element) {
         int index = element.indexOf("=");
         if (index == -1) {
-          if (!element.isEmpty) map[element] = "";
+          if (!element.isEmpty) map[decodeQueryComponent(element)] = "";
         } else if (index != 0) {
           var key = element.substring(0, index);
           var value = element.substring(index + 1);
           map[Uri.decodeQueryComponent(key)] = decodeQueryComponent(value);
         }
         return map;
     });
   }
 
   static String _makeScheme(String scheme) {
@@ skipping 106 matching lines @@
         }
       }
       return byte;
     }
 
     // Start building the normalized component string.
     StringBuffer result;
     int length = component.length;
     int index = 0;
     int prevIndex = 0;
+
+    // Copy a part of the component string to the result.
+    fillResult() {

[Lasse Reichstein Nielsen, 2013/06/03 07:56:47]

void return type.
Makes it more obvious that this is a function declaration.

[Søren Gjesse, 2013/06/03 09:35:41]

Done.

+      if (result == null) {
+        assert(prevIndex == 0);
+        result = new StringBuffer(component.substring(prevIndex, index));
+      } else {
+        result.write(component.substring(prevIndex, index));
+      }
+    }
+
     while (index < length) {
 
-      // Copy a part of the component string to the result.
-      fillResult() {
-        if (result == null) {
-          assert(prevIndex == 0);
-          result = new StringBuffer(component.substring(prevIndex, index));
-        } else {
-          result.write(component.substring(prevIndex, index));
-        }
-      }
-
       // Normalize percent encoding to uppercase and don't encode
       // unreserved characters.
       if (component.codeUnitAt(index) == _PERCENT) {
         if (length < index + 2) {
             throw new ArgumentError(
                 "Invalid percent-encoding in URI component: $component");
         }
 
         var codeUnit1 = component.codeUnitAt(index + 1);
         var codeUnit2 = component.codeUnitAt(index + 2);
@@ skipping 11 matching lines @@
             result.writeCharCode(normalizeHexDigit(index + 1));
             result.writeCharCode(normalizeHexDigit(index + 2));
           }
           index += 3;
           prevIndex = index;
         }
       } else {
         index++;
       }
     }
+    if (result != null && prevIndex != index) fillResult();
     assert(index == length);
 
     if (result == null) return component;
     return result.toString();
   }
 
   static String _emptyIfNull(String val) => val != null ? val : '';
 
   static int _parseIntOrZero(String val) {
     if (val != null && val != '') {
@@ skipping 571 matching lines @@
       0xafff,   // 0x30 - 0x3f  1111111111110101
                 //              @ABCDEFGHIJKLMNO
       0xffff,   // 0x40 - 0x4f  1111111111111111
                 //              PQRSTUVWXYZ    _
       0x87ff,   // 0x50 - 0x5f  1111111111100001
                 //               abcdefghijklmno
       0xfffe,   // 0x60 - 0x6f  0111111111111111
                 //              pqrstuvwxyz   ~
       0x47ff];  // 0x70 - 0x7f  1111111111100010
 }