suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing helpers.js

Browse Source
This commit is contained in:
Danny Yoo 2011-07-05 16:48:15 -04:00
parent 7a0c6381db
commit 1bb1b70192
7 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js-assembler/get-runtime.rkt
View File

@ -9,13 +9,8 @@
;; HashTable at the toplevel
;; jsnums at the toplevel
;;
;; followed by:
;; followed by the base library
;;
;; plt.link
;; plt.helpers
;; plt.types
;; plt.primitives
;; plt.runtime
@ -58,7 +53,10 @@
(define-runtime-path link.js "runtime-src/link.js")
;; from js-vm
(define-runtime-path helpers.js "runtime-src/helpers.js")
;; Deprecated:
;; (define-runtime-path helpers.js "runtime-src/helpers.js")
;; from js-vm
(define-runtime-path types.js "runtime-src/types.js")
;; These primitives were coded for the js-vm project, and we'll gradually
@ -79,6 +77,7 @@
jsnums.js
baselib.js
baselib_unionfind.js
baselib_equality.js
baselib_format.js
@ -98,7 +97,7 @@
baselib_readergraph.js
link.js
helpers.js
; helpers.js
types.js
; js-vm-primitives.js
runtime.js))

26
js-assembler/runtime-src/baselib.js
View File

@ -1,4 +1,6 @@
// Skeleton for basic library functions
// Basic library functions. This will include a few simple functions,
// but be augmented with several namespaces for the other libraries in
// the base library.
if (! this['plt']) { this['plt'] = {}; }
(function (plt) {
var baselib = {};
@ -6,9 +8,7 @@ if (! this['plt']) { this['plt'] = {}; }
// Inheritance.
// Simple object inheritance.
var heir = function(parentPrototype) {
var f = function() {}
f.prototype = parentPrototype;
@ -17,8 +17,26 @@ if (! this['plt']) { this['plt'] = {}; }
// clone: object -> object
// Copies an object. The new object should respond like the old
// object, including to things like instanceof.
var clone = function(obj) {
var C = function() {}
C.prototype = obj;
var c = new C();
for (property in obj) {
if (obj.hasOwnProperty(property)) {
c[property] = obj[property];
}
}
return c;
};
baselib.heir = heir;
baselib.clone = clone;
})(this['plt']);

46
js-assembler/runtime-src/baselib_exceptions.js
View File

@ -25,48 +25,30 @@
};
// (define-struct exn (message continuation-mark-set))
var Exn = plt.baselib.structs.makeStructureType(
'exn',
false,
2,
0,
false,
function(args, name, k) {
// helpers.check(args[0], isString, name, 'string', 1);
// helpers.check(args[1], types.isContinuationMarkSet,
// name, 'continuation mark set', 2);
return k(args);
});
'exn', false, 2, 0, false, false);
// (define-struct (exn:break exn) (continuation))
var ExnBreak = plt.baselib.structs.makeStructureType(
'exn:break', Exn, 1, 0, false,
function(args, name, k) {
// helpers.check(args[2], function(x) { return x instanceof ContinuationClosureValue; },
// name, 'continuation', 3);
return k(args);
});
'exn:break', Exn, 1, 0, false, false);
var ExnFail =
plt.baselib.structs.makeStructureType('exn:fail',
Exn, 0, 0, false, false);
var ExnFailContract =
plt.baselib.structs.makeStructureType('exn:fail:contract',
ExnFail, 0, 0, false, false);
var ExnFail = plt.baselib.structs.makeStructureType(
'exn:fail', Exn, 0, 0, false, false);
var ExnFailContractArity =
plt.baselib.structs.makeStructureType('exn:fail:contract:arity',
ExnFailContract, 0, 0, false, false);
var ExnFailContract = plt.baselib.structs.makeStructureType(
'exn:fail:contract', ExnFail, 0, 0, false, false);
var ExnFailContractVariable =
plt.baselib.structs.makeStructureType('exn:fail:contract:variable',
ExnFailContract, 1, 0, false, false);
var ExnFailContractArity = plt.baselib.structs.makeStructureType(
'exn:fail:contract:arity', ExnFailContract, 0, 0, false, false);
var ExnFailContractDivisionByZero =
plt.baselib.structs.makeStructureType('exn:fail:contract:divide-by-zero',
ExnFailContract, 0, 0, false, false);
var ExnFailContractVariable = plt.baselib.structs.makeStructureType(
'exn:fail:contract:variable', ExnFailContract, 1, 0, false, false);
var ExnFailContractDivisionByZero = plt.baselib.structs.makeStructureType(
'exn:fail:contract:divide-by-zero', ExnFailContract, 0, 0, false, false);

2
js-assembler/runtime-src/baselib_readergraph.js
View File

@ -39,7 +39,7 @@
}
if (types.isStruct(x)) {
var aStruct = helpers.clone(x);
var aStruct = baselib.clone(x);
objectHash.put(x, aStruct);
for(var i = 0 ;i < x._fields.length; i++) {
x._fields[i] = readerGraph(x._fields[i], objectHash, n+1);

3
js-assembler/runtime-src/runtime.js
View File

@ -9,7 +9,6 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
var runtime = {};
scope['runtime'] = runtime;
var helpers = plt.helpers;
var types = plt.types;
@ -41,7 +40,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
var makeList = types.list;
var makePair = types.pair;
var heir = helpers.heir;
var heir = plt.baselib.heir;
var toDomNode = plt.baselib.format.toDomNode;
var toWrittenString = plt.baselib.format.toWrittenString;
var toDisplayedString = plt.baselib.format.toDisplayedString;

2
js-assembler/runtime-src/types.js
View File

@ -17,8 +17,6 @@ if (! this['plt']) { this['plt'] = {}; }
scope['types'] = types;
// helpers refers to plt.helpers.
var helpers = scope['helpers'];
var getEqHashCode = plt.baselib.hash.getEqHashCode;

3
tests/more-tests/run-more-tests.rkt
View File

@ -10,4 +10,5 @@
(test "conform.rkt")
(test "sk-generator.rkt")
(test "sk-generator-2.rkt")
(test "simple-structs.rkt")
(test "simple-structs.rkt")
(test "man-vs-boy.rkt")