more jslinting

This commit is contained in:
Danny Yoo 2011-08-07 23:46:20 -04:00
parent 40c8d6b0aa
commit 2be2c72754
2 changed files with 95 additions and 102 deletions

View File

@ -1,5 +1,10 @@
/*jslint unparam: true, vars: true, white: true, newcap: true, nomen: true, plusplus: true, maxerr: 50, indent: 4 */
/*global Hashtable*/
(function (baselib) { (function (baselib) {
'use strict';
var exports = {}; var exports = {};
baselib.hashes = exports; baselib.hashes = exports;
@ -60,10 +65,10 @@
EqHashTable.prototype.toWrittenString = function (cache) { EqHashTable.prototype.toWrittenString = function (cache) {
var keys = this.hash.keys(); var keys = this.hash.keys();
var ret = []; var ret = [], i;
for (var i = 0; i < keys.length; i++) { for (i = 0; i < keys.length; i++) {
var keyStr = toWrittenString(keys[i], cache); var keyStr = baselib.format.toWrittenString(keys[i], cache);
var valStr = toWrittenString(this.hash.get(keys[i]), cache); var valStr = baselib.format.toWrittenString(this.hash.get(keys[i]), cache);
ret.push('(' + keyStr + ' . ' + valStr + ')'); ret.push('(' + keyStr + ' . ' + valStr + ')');
} }
return ('#hasheq(' + ret.join(' ') + ')'); return ('#hasheq(' + ret.join(' ') + ')');
@ -71,10 +76,10 @@
EqHashTable.prototype.toDisplayedString = function (cache) { EqHashTable.prototype.toDisplayedString = function (cache) {
var keys = this.hash.keys(); var keys = this.hash.keys();
var ret = []; var ret = [], i;
for (var i = 0; i < keys.length; i++) { for (i = 0; i < keys.length; i++) {
var keyStr = toDisplayedString(keys[i], cache); var keyStr = baselib.format.toDisplayedString(keys[i], cache);
var valStr = toDisplayedString(this.hash.get(keys[i]), cache); var valStr = baselib.format.toDisplayedString(this.hash.get(keys[i]), cache);
ret.push('(' + keyStr + ' . ' + valStr + ')'); ret.push('(' + keyStr + ' . ' + valStr + ')');
} }
return ('#hasheq(' + ret.join(' ') + ')'); return ('#hasheq(' + ret.join(' ') + ')');
@ -85,14 +90,14 @@
return false; return false;
} }
if (this.hash.keys().length != other.hash.keys().length) { if (this.hash.keys().length !== other.hash.keys().length) {
return false; return false;
} }
var keys = this.hash.keys(); var keys = this.hash.keys(), i;
for (var i = 0; i < keys.length; i++){ for (i = 0; i < keys.length; i++) {
if (!(other.hash.containsKey(keys[i]) && if (!(other.hash.containsKey(keys[i]) &&
plt.baselib.equality.equals(this.hash.get(keys[i]), baselib.equality.equals(this.hash.get(keys[i]),
other.hash.get(keys[i]), other.hash.get(keys[i]),
aUnionFind))) { aUnionFind))) {
return false; return false;
@ -106,32 +111,32 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Equal hash tables // Equal hash tables
var EqualHashTable = function (inputHash) { var EqualHashTable = function (inputHash) {
this.hash = new _Hashtable( this.hash = new Hashtable(
function (x) { function (x) {
return plt.baselib.format.toWrittenString(x); return baselib.format.toWrittenString(x);
}, },
function (x, y) { function (x, y) {
return plt.baselib.equality.equals(x, y, new plt.baselib.UnionFind()); return baselib.equality.equals(x, y, new baselib.UnionFind());
}); });
this.mutable = true; this.mutable = true;
}; };
EqualHashTable.prototype.toWrittenString = function (cache) { EqualHashTable.prototype.toWrittenString = function (cache) {
var keys = this.hash.keys(); var keys = this.hash.keys();
var ret = []; var ret = [], i;
for (var i = 0; i < keys.length; i++) { for (i = 0; i < keys.length; i++) {
var keyStr = plt.baselib.format.toWrittenString(keys[i], cache); var keyStr = baselib.format.toWrittenString(keys[i], cache);
var valStr = plt.baselib.format.toWrittenString(this.hash.get(keys[i]), cache); var valStr = baselib.format.toWrittenString(this.hash.get(keys[i]), cache);
ret.push('(' + keyStr + ' . ' + valStr + ')'); ret.push('(' + keyStr + ' . ' + valStr + ')');
} }
return ('#hash(' + ret.join(' ') + ')'); return ('#hash(' + ret.join(' ') + ')');
}; };
EqualHashTable.prototype.toDisplayedString = function (cache) { EqualHashTable.prototype.toDisplayedString = function (cache) {
var keys = this.hash.keys(); var keys = this.hash.keys();
var ret = []; var ret = [], i;
for (var i = 0; i < keys.length; i++) { for (i = 0; i < keys.length; i++) {
var keyStr = plt.baselib.format.toDisplayedString(keys[i], cache); var keyStr = baselib.format.toDisplayedString(keys[i], cache);
var valStr = plt.baselib.format.toDisplayedString(this.hash.get(keys[i]), cache); var valStr = baselib.format.toDisplayedString(this.hash.get(keys[i]), cache);
ret.push('(' + keyStr + ' . ' + valStr + ')'); ret.push('(' + keyStr + ' . ' + valStr + ')');
} }
return ('#hash(' + ret.join(' ') + ')'); return ('#hash(' + ret.join(' ') + ')');
@ -142,14 +147,14 @@
return false; return false;
} }
if (this.hash.keys().length != other.hash.keys().length) { if (this.hash.keys().length !== other.hash.keys().length) {
return false; return false;
} }
var keys = this.hash.keys(); var keys = this.hash.keys(), i;
for (var i = 0; i < keys.length; i++){ for (i = 0; i < keys.length; i++){
if (! (other.hash.containsKey(keys[i]) && if (! (other.hash.containsKey(keys[i]) &&
plt.baselib.equality.equals(this.hash.get(keys[i]), baselib.equality.equals(this.hash.get(keys[i]),
other.hash.get(keys[i]), other.hash.get(keys[i]),
aUnionFind))) { aUnionFind))) {
return false; return false;
@ -167,21 +172,6 @@
}; };
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
exports.getEqHashCode = getEqHashCode; exports.getEqHashCode = getEqHashCode;
@ -194,4 +184,4 @@
exports.isHash = isHash; exports.isHash = isHash;
})(this['plt'].baselib); }(this.plt.baselib));

View File

@ -1,6 +1,9 @@
/*jslint vars: true, maxerr: 50, indent: 4 */
// Structure types // Structure types
(function (baselib) { (function (baselib) {
'use strict';
var exports = {}; var exports = {};
baselib.inspectors = exports; baselib.inspectors = exports;
@ -23,4 +26,4 @@
exports.isInspector = isInspector; exports.isInspector = isInspector;
})(this['plt'].baselib); }(this.plt.baselib));