Fix a bug in the hashString function resulting in all string hashes being 0 (immutable-js#1325)

errendir · leebyron · commit 81bd72936e97 · 2017-10-02T12:34:49.000-07:00
* Fix the typo in the hashString resulting in all string hashes being 0

* Fix a typo resulting in hashJSObj only returning undefined

* Add dist artifacts
diff --git a/dist/immutable.es.js b/dist/immutable.es.js
@@ -906,7 +906,7 @@ function hashString(string) {
   // (exclusive) by dropping high bits.
   var hashed = 0;
   for (var ii = 0; ii < string.length; ii++) {
-    hashed = (31 * hash + string.charCodeAt(ii)) | 0;
+    hashed = (31 * hashed + string.charCodeAt(ii)) | 0;
   }
   return smi(hashed);
 }
@@ -921,7 +921,7 @@ function hashJSObj(obj) {
   }
 
   hashed = obj[UID_HASH_KEY];
-  if (hash !== undefined) {
+  if (hashed !== undefined) {
     return hashed;
   }
 
diff --git a/dist/immutable.js b/dist/immutable.js
@@ -912,7 +912,7 @@ function hashString(string) {
   // (exclusive) by dropping high bits.
   var hashed = 0;
   for (var ii = 0; ii < string.length; ii++) {
-    hashed = (31 * hash + string.charCodeAt(ii)) | 0;
+    hashed = (31 * hashed + string.charCodeAt(ii)) | 0;
   }
   return smi(hashed);
 }
@@ -927,7 +927,7 @@ function hashJSObj(obj) {
   }
 
   hashed = obj[UID_HASH_KEY];
-  if (hash !== undefined) {
+  if (hashed !== undefined) {
     return hashed;
   }
 
diff --git a/dist/immutable.min.js b/dist/immutable.min.js
diff --git a/src/Hash.js b/src/Hash.js
@@ -77,7 +77,7 @@ function hashString(string) {
   // (exclusive) by dropping high bits.
   let hashed = 0;
   for (let ii = 0; ii < string.length; ii++) {
-    hashed = (31 * hash + string.charCodeAt(ii)) | 0;
+    hashed = (31 * hashed + string.charCodeAt(ii)) | 0;
   }
   return smi(hashed);
 }
@@ -92,7 +92,7 @@ function hashJSObj(obj) {
   }
 
   hashed = obj[UID_HASH_KEY];
-  if (hash !== undefined) {
+  if (hashed !== undefined) {
     return hashed;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ function hashString(string) {`
`906`	`906`	`// (exclusive) by dropping high bits.`
`907`	`907`	`var hashed = 0;`
`908`	`908`	`for (var ii = 0; ii < string.length; ii++) {`
`909`		`- hashed = (31 * hash + string.charCodeAt(ii)) \| 0;`
	`909`	`+ hashed = (31 * hashed + string.charCodeAt(ii)) \| 0;`
`910`	`910`	`}`
`911`	`911`	`return smi(hashed);`
`912`	`912`	`}`
`@@ -921,7 +921,7 @@ function hashJSObj(obj) {`
`921`	`921`	`}`
`922`	`922`
`923`	`923`	`hashed = obj[UID_HASH_KEY];`
`924`		`- if (hash !== undefined) {`
	`924`	`+ if (hashed !== undefined) {`
`925`	`925`	`return hashed;`
`926`	`926`	`}`
`927`	`927`
Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,7 @@ function hashString(string) {`
`912`	`912`	`// (exclusive) by dropping high bits.`
`913`	`913`	`var hashed = 0;`
`914`	`914`	`for (var ii = 0; ii < string.length; ii++) {`
`915`		`- hashed = (31 * hash + string.charCodeAt(ii)) \| 0;`
	`915`	`+ hashed = (31 * hashed + string.charCodeAt(ii)) \| 0;`
`916`	`916`	`}`
`917`	`917`	`return smi(hashed);`
`918`	`918`	`}`
`@@ -927,7 +927,7 @@ function hashJSObj(obj) {`
`927`	`927`	`}`
`928`	`928`
`929`	`929`	`hashed = obj[UID_HASH_KEY];`
`930`		`- if (hash !== undefined) {`
	`930`	`+ if (hashed !== undefined) {`
`931`	`931`	`return hashed;`
`932`	`932`	`}`
`933`	`933`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ function hashString(string) {`
`77`	`77`	`// (exclusive) by dropping high bits.`
`78`	`78`	`let hashed = 0;`
`79`	`79`	`for (let ii = 0; ii < string.length; ii++) {`
`80`		`- hashed = (31 * hash + string.charCodeAt(ii)) \| 0;`
	`80`	`+ hashed = (31 * hashed + string.charCodeAt(ii)) \| 0;`
`81`	`81`	`}`
`82`	`82`	`return smi(hashed);`
`83`	`83`	`}`
`@@ -92,7 +92,7 @@ function hashJSObj(obj) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`hashed = obj[UID_HASH_KEY];`
`95`		`- if (hash !== undefined) {`
	`95`	`+ if (hashed !== undefined) {`
`96`	`96`	`return hashed;`
`97`	`97`	`}`
`98`	`98`