* fixing the resolution of the ancestor by traversing until we find date calendar / numbers fields, this should fix the problems with fr-FR vs fr, which are suppose to be the exact same.

* removing dead code from tasks
* removing old tasks.

Author: caridy

tasks/compile-data.js

@@ -1,3 +1,5 @@
+/* jshint node:true */
+
 /**
  * Compiles all JSON data into the polyfill and saves it as Intl.complete.js
  */

tasks/extract-cldr-data.js

@@ -1,3 +1,5 @@
+/* jshint node:true */
+
 /**
  * Compiles all JSON data into the polyfill and saves it as Intl.complete.js
  */

tasks/getIntlData.js

@@ -1,3 +1,5 @@
+/* jshint node:true */
+
 /* updating tests from tests/test262 */
 
 var LIBS = {
@@ -147,8 +149,8 @@ function processTest(content) {
     // Make sure to use our version (not one the browser might have).
     content = content.replace(/\bIntl\b/g, 'IntlPolyfill');
 
-    var explainV8OptOut = '// This test is disabled to avoid the v8 bug outlined at https://code.google.com/p/v8/issues/detail?id=2694',
-        explainES6OptOut = '// This test is disabled because it relies on ES 2015 behaviour, which is not implemented in environments that need this polyfill',
+    var explainV8OptOut = '// This test is disabled to avoid the v8 bug outlined at https://code.google.com/p/v8/issues/detail?id=2694';
+    var explainES6OptOut = '// This test is disabled because it relies on ES 2015 behaviour, which is not implemented in environments that need this polyfill';
 
     // Due to a bug in v8, we need to disable parts of the _L15 tests that
     // check the function property `length` is not writable

tasks/update-tests.js

@@ -1,8 +1,5 @@
-/*
- * Copyright 2015, Yahoo Inc.
- * Copyrights licensed under the New BSD License.
- * See the accompanying LICENSE file for terms.
- */
+/* jshint node:true */
+
 'use strict';
 
 var path   = require('path');
@@ -31,48 +28,30 @@ module.exports = function extractCalendars(locales) {
         }
     }
 
-    // Hashes and caches the `calendars` for a given `locale` to avoid hashing more
-    // than once since it could be expensive.
-    function hashCalendars(locale, calendars) {
-        var hash = hashes[locale];
-        if (hash) {
-            return hash;
+    // This will traverse the hierarchy for the
+    // given `locale` until it finds an ancestor with date calendars.
+    function findLocaleWithCalendar(locale) {
+        // The "root" locale is the top level ancestor.
+        if (locale === 'root') {
+            return 'root';
         }
 
-        hash = hashes[locale] = JSON.stringify(calendars);
-        return hash;
-    }
-
-    // We want to de-dup data that can be referenced from upstream in the
-    // `locale`'s hierarchy when that locale's date calendars are the _exact_
-    // same as one of its ancestors. This will traverse the hierarchy for the
-    // given `locale` until it finds an ancestor with same same date calendars.
-    // When an ancestor can't be found, a data entry must be created for the
-    // `locale` since its date calendars are unique.
-    function findGreatestAncestor(locale) {
-        // The "root" locale is not a suitable ancestor, because there won't be
-        // an entry for "root" in the final data object.
-        var parentLocale = getParentLocale(locale);
-        if (!parentLocale || parentLocale === 'root') {
-            return 'root';
+        if (hasCalendars(locale)) {
+            return locale;
         }
 
         // When the `locale` doesn't have calendars data, we need to traverse up
         // its hierarchy to find suitable date calendars data.
-        if (!hasCalendars(locale)) {
-            return findGreatestAncestor(parentLocale);
-        }
-
-        return locale;
+        return findLocaleWithCalendar(getParentLocale(locale));
     }
 
     return locales.reduce(function (calendars, locale) {
         locale = normalizeLocale(locale);
 
         // Walk the `locale`'s hierarchy to look for suitable ancestor with the
-        // _exact_ same date calendars. If no ancestor is found, the given
+        // date calendars. If no ancestor is found, the given
         // `locale` will be returned.
-        var resolvedLocale = hasCalendars(locale) ? locale : findGreatestAncestor(locale);
+        var resolvedLocale = findLocaleWithCalendar(locale);
 
         // Add an entry for the `locale`, which might be an ancestor. If the
         // locale doesn't have relative fields, then we fallback to the "root"

tasks/utils/extract-calendars.js

@@ -1,3 +1,5 @@
+/* jshint node:true */
+
 'use strict';
 
 var path   = require('path');
@@ -24,49 +26,30 @@ module.exports = function extractNumbersFields(locales) {
         }
     }
 
-    // Hashes and caches the `numbers` for a given `locale` to avoid hashing more
-    // than once since it could be expensive.
-    function hashNumbers(locale, numbers) {
-        var hash = hashes[locale];
-        if (hash) {
-            return hash;
+    // This will traverse the hierarchy for the
+    // given `locale` until it finds an ancestor with numbers fields.
+    function findLocaleWithNumbersFields(locale) {
+        // The "root" locale is the top level ancestor.
+        if (locale === 'root') {
+            return 'root';
         }
 
-        hash = hashes[locale] = JSON.stringify(numbers);
-        return hash;
-    }
-
-    // We want to de-dup data that can be referenced from upstream in the
-    // `locale`'s hierarchy when that locale's numbers fields are the _exact_
-    // same as one of its ancestors. This will traverse the hierarchy for the
-    // given `locale` until it finds an ancestor with same same numbers fields.
-    // When an ancestor can't be found, a data entry must be created for the
-    // `locale` since its numbers fields are unique.
-    function findGreatestAncestor(locale) {
-        // The "root" locale is not a suitable ancestor, because there won't be
-        // an entry for "root" in the final data object.
-        var parentLocale = getParentLocale(locale);
-
-        if (!parentLocale || parentLocale === 'root') {
-            return 'root';
+        if (hasNumbersFields(locale)) {
+            return locale;
         }
 
         // When the `locale` doesn't have numbers fields, we need to traverse up
         // its hierarchy to find suitable numbers fields data.
-        if (!hasNumbersFields(locale)) {
-            return findGreatestAncestor(parentLocale);
-        }
-
-        return locale;
+        return findLocaleWithNumbersFields(getParentLocale(locale));
     }
 
     return locales.reduce(function (numbers, locale) {
         locale = normalizeLocale(locale);
 
         // Walk the `locale`'s hierarchy to look for suitable ancestor with the
-        // _exact_ same numbers fields. If no ancestor is found, the given
+        // date calendars. If no ancestor is found, the given
         // `locale` will be returned.
-        var resolvedLocale = hasNumbersFields(locale) ? locale : findGreatestAncestor(locale);
+        var resolvedLocale = findLocaleWithNumbersFields(locale);
 
         // Add an entry for the `locale`, which might be an ancestor. If the
         // locale doesn't have relative fields, then we fallback to the "root"

tasks/utils/extract-numbers.js

@@ -1,3 +1,5 @@
+/* jshint node:true */
+
 'use strict';
 
 var glob = require('glob');