port polymer - 00e2982c78fcd396adaebff3118e94029a2b9fb0

pkg/polymer/lib/deserialize.dart

 // Copyright (c) 2013, 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.
 
 library polymer.deserialize;
 
 import 'dart:convert' show JSON;
 import 'dart:mirrors' show TypeMirror;
 
 final _typeHandlers = () {
@@ skipping 12 matching lines @@
   };
   m[#dart.core.bool] = (x, _) => x != 'false';
   m[#dart.core.int] =
       (x, def) => int.parse(x, onError: (_) => def);
   m[#dart.core.double] =
       (x, def) => double.parse(x, (_) => def);
   return m;
 }();
 
 /**
- * Convert representation of [value] based on type of [defaultValue].
+ * Convert representation of [value] based on type of [currentValue].
  */
-Object deserializeValue(String value, Object defaultValue, TypeMirror type) {
+Object deserializeValue(String value, Object currentValue, TypeMirror type) {
   var handler = _typeHandlers[type.qualifiedName];
-  if (handler != null) return handler(value, defaultValue);
+  if (handler != null) return handler(value, currentValue);
 
   try {
     // If the string is an object, we can parse is with the JSON library.
     // include convenience replace for single-quotes. If the author omits
     // quotes altogether, parse will fail.
     return JSON.decode(value.replaceAll("'", '"'));
 
     // TODO(jmesserly): deserialized JSON is not assignable to most objects in
     // Dart. We should attempt to convert it appropriately.
   } catch(e) {
     // The object isn't valid JSON, return the raw value
     return value;
   }
 }