jslint on structs
This commit is contained in:
Danny Yoo
parent
7d89299827
commit
d6cf8236e2
|
|
@ -1,12 +1,69 @@
|
|||
// Structure types
|
||||
|
||||
/*jslint browser: true, unparam: true, vars: true, white: true, nomen: true, plusplus: true, maxerr: 50, indent: 4 */
|
||||
/*globals $*/
|
||||
(function (baselib) {
|
||||
"use strict";
|
||||
var exports = {};
|
||||
baselib.structs = exports;
|
||||
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
var Struct = function (constructorName, fields) {
|
||||
this._constructorName = constructorName;
|
||||
this._fields = [];
|
||||
};
|
||||
|
||||
Struct.prototype.toWrittenString = function (cache) {
|
||||
var buffer = [], i;
|
||||
cache.put(this, true);
|
||||
buffer.push("(");
|
||||
buffer.push(this._constructorName);
|
||||
for(i = 0; i < this._fields.length; i++) {
|
||||
buffer.push(" ");
|
||||
buffer.push(baselib.format.toWrittenString(this._fields[i], cache));
|
||||
}
|
||||
buffer.push(")");
|
||||
return buffer.join("");
|
||||
};
|
||||
|
||||
Struct.prototype.toDisplayedString = function (cache) {
|
||||
return baselib.format.toWrittenString(this, cache);
|
||||
};
|
||||
|
||||
Struct.prototype.toDomNode = function (params) {
|
||||
var node = document.createElement("span"), i;
|
||||
params.put(this, true);
|
||||
$(node).append(document.createTextNode("("));
|
||||
$(node).append(document.createTextNode(this._constructorName));
|
||||
for(i = 0; i < this._fields.length; i++) {
|
||||
$(node).append(document.createTextNode(" "));
|
||||
$(node).append(baselib.format.toDomNode(this._fields[i], params));
|
||||
}
|
||||
$(node).append(document.createTextNode(")"));
|
||||
return node;
|
||||
};
|
||||
|
||||
|
||||
Struct.prototype.equals = function (other, aUnionFind) {
|
||||
var i;
|
||||
if (!(other instanceof this.type)) {
|
||||
return false;
|
||||
}
|
||||
for (i = 0; i < this._fields.length; i++) {
|
||||
if (! baselib.equality.equals(this._fields[i],
|
||||
other._fields[i],
|
||||
aUnionFind)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
Struct.prototype.type = Struct;
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
var StructType = function (name, // string
|
||||
|
|
@ -52,6 +109,21 @@
|
|||
|
||||
|
||||
|
||||
// Default structure guard just calls the continuation argument.
|
||||
var DEFAULT_GUARD = function (args, name, k) {
|
||||
return k(args);
|
||||
};
|
||||
|
||||
|
||||
// The default parent type refers to the toplevel Struct.
|
||||
var DEFAULT_PARENT_TYPE = { type: Struct,
|
||||
numberOfArgs: 0,
|
||||
numberOfFields: 0,
|
||||
firstField: 0,
|
||||
applyGuard: DEFAULT_GUARD };
|
||||
|
||||
|
||||
|
||||
// makeStructureType: string StructType number number boolean
|
||||
// guard-function -> StructType
|
||||
//
|
||||
|
|
@ -63,6 +135,8 @@
|
|||
autoFieldCnt,
|
||||
autoV,
|
||||
guard) {
|
||||
|
||||
|
||||
// Defaults
|
||||
autoFieldCnt = autoFieldCnt || 0;
|
||||
parentType = parentType || DEFAULT_PARENT_TYPE;
|
||||
|
|
@ -70,23 +144,24 @@
|
|||
|
||||
|
||||
|
||||
// rawConstructor creates a new struct type inheriting from
|
||||
// RawConstructor creates a new struct type inheriting from
|
||||
// the parent, with no guard checks.
|
||||
var rawConstructor = function(name, args) {
|
||||
var RawConstructor = function (name, args) {
|
||||
var i;
|
||||
parentType.type.call(this, name, args);
|
||||
for (var i = 0; i < initFieldCnt; i++) {
|
||||
for (i = 0; i < initFieldCnt; i++) {
|
||||
this._fields.push(args[i+parentType.numberOfArgs]);
|
||||
}
|
||||
for (var i = 0; i < autoFieldCnt; i++) {
|
||||
for (i = 0; i < autoFieldCnt; i++) {
|
||||
this._fields.push(autoV);
|
||||
}
|
||||
};
|
||||
rawConstructor.prototype = baselib.heir(parentType.type.prototype);
|
||||
RawConstructor.prototype = baselib.heir(parentType.type.prototype);
|
||||
|
||||
|
||||
|
||||
// Set type, necessary for equality checking
|
||||
rawConstructor.prototype.type = rawConstructor;
|
||||
RawConstructor.prototype.type = RawConstructor;
|
||||
|
||||
// The structure type consists of the name, its constructor, a
|
||||
// record of how many argument it and its parent type contains,
|
||||
|
|
@ -94,7 +169,7 @@
|
|||
// to the constructor, the predicate, the accessor, and mutators.
|
||||
var newType = new StructType(
|
||||
theName,
|
||||
rawConstructor,
|
||||
RawConstructor,
|
||||
initFieldCnt + parentType.numberOfArgs,
|
||||
initFieldCnt + autoFieldCnt,
|
||||
parentType.firstField + parentType.numberOfFields,
|
||||
|
|
@ -116,12 +191,12 @@
|
|||
args,
|
||||
baselib.symbols.Symbol.makeInstance(theName),
|
||||
function (res) {
|
||||
return new rawConstructor(theName, res); });
|
||||
return new RawConstructor(theName, res); });
|
||||
},
|
||||
|
||||
// predicate
|
||||
function (x) {
|
||||
return x instanceof rawConstructor;
|
||||
return x instanceof RawConstructor;
|
||||
},
|
||||
|
||||
// accessor
|
||||
|
|
@ -137,125 +212,6 @@
|
|||
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
var Struct = function(constructorName, fields) {
|
||||
this._constructorName = constructorName;
|
||||
this._fields = [];
|
||||
};
|
||||
|
||||
Struct.prototype.toWrittenString = function(cache) {
|
||||
cache.put(this, true);
|
||||
var buffer = [];
|
||||
buffer.push("(");
|
||||
buffer.push(this._constructorName);
|
||||
for(var i = 0; i < this._fields.length; i++) {
|
||||
buffer.push(" ");
|
||||
buffer.push(plt.baselib.format.toWrittenString(this._fields[i], cache));
|
||||
}
|
||||
buffer.push(")");
|
||||
return buffer.join("");
|
||||
};
|
||||
|
||||
Struct.prototype.toDisplayedString = function(cache) {
|
||||
return plt.baselib.format.toWrittenString(this, cache);
|
||||
};
|
||||
|
||||
Struct.prototype.toDomNode = function(params) {
|
||||
params.put(this, true);
|
||||
var node = document.createElement("span");
|
||||
$(node).append(document.createTextNode("("));
|
||||
$(node).append(document.createTextNode(this._constructorName));
|
||||
for(var i = 0; i < this._fields.length; i++) {
|
||||
$(node).append(document.createTextNode(" "));
|
||||
$(node).append(plt.baselib.format.toDomNode(this._fields[i], params));
|
||||
}
|
||||
$(node).append(document.createTextNode(")"));
|
||||
return node;
|
||||
};
|
||||
|
||||
|
||||
Struct.prototype.equals = function(other, aUnionFind) {
|
||||
if ( other.type == undefined ||
|
||||
this.type !== other.type ||
|
||||
!(other instanceof this.type) ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (var i = 0; i < this._fields.length; i++) {
|
||||
if (! equals(this._fields[i],
|
||||
other._fields[i],
|
||||
aUnionFind)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
Struct.prototype.type = Struct;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// // Struct Procedure types
|
||||
// var StructProc = function(type, name, numParams, isRest, usesState, impl) {
|
||||
// PrimProc.call(this, name, numParams, isRest, usesState, impl);
|
||||
// this.type = type;
|
||||
// };
|
||||
// StructProc.prototype = baselib.heir(PrimProc.prototype);
|
||||
|
||||
// var StructConstructorProc = function() {
|
||||
// StructProc.apply(this, arguments);
|
||||
// };
|
||||
// StructConstructorProc.prototype = baselib.heir(StructProc.prototype);
|
||||
|
||||
// var StructPredicateProc = function() {
|
||||
// StructProc.apply(this, arguments);
|
||||
// };
|
||||
// StructPredicateProc.prototype = baselib.heir(StructProc.prototype);
|
||||
|
||||
// var StructAccessorProc = function() {
|
||||
// StructProc.apply(this, arguments);
|
||||
// };
|
||||
// StructAccessorProc.prototype = baselib.heir(StructProc.prototype);
|
||||
|
||||
// var StructMutatorProc = function() {
|
||||
// StructProc.apply(this, arguments);
|
||||
// };
|
||||
// StructMutatorProc.prototype = baselib.heir(StructProc.prototype);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// Default structure guard just calls the continuation argument.
|
||||
var DEFAULT_GUARD = function(args, name, k) {
|
||||
return k(args);
|
||||
};
|
||||
|
||||
|
||||
// The default parent type refers to the toplevel Struct.
|
||||
var DEFAULT_PARENT_TYPE = { type: Struct,
|
||||
numberOfArgs: 0,
|
||||
numberOfFields: 0,
|
||||
firstField: 0,
|
||||
applyGuard: DEFAULT_GUARD };
|
||||
|
||||
|
||||
|
||||
var isStruct = function (x) { return x instanceof Struct; };
|
||||
|
|
@ -271,16 +227,4 @@
|
|||
exports.isStruct = isStruct;
|
||||
exports.isStructType = isStructType;
|
||||
|
||||
// exports.StructProc = StructProc;
|
||||
// exports.StructConstructorProc = StructConstructorProc;
|
||||
// exports.StructPredicateProc = StructPredicateProc;
|
||||
// exports.StructAccessorProc = StructAccessorProc;
|
||||
// exports.StructMutatorProc = StructMutatorProc;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
})(this['plt'].baselib);
|
||||
}(this.plt.baselib));
|
||||
Loading…
Reference in New Issue
Block a user