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

continuing to work on structures

Browse Source
This commit is contained in:
Danny Yoo 2011-06-30 18:00:11 -04:00
parent 8a244b85bc
commit 7117320b1b
3 changed files with 170 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/kernel-primitives.rkt
View File

@ -64,6 +64,10 @@
'for-each 'for-each
'current-print 'current-print
'make-struct-type
'current-inspector
'make-struct-field-accessor
)) ))
(define-predicate KernelPrimitiveName? KernelPrimitiveName) (define-predicate KernelPrimitiveName? KernelPrimitiveName)

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

@ -116,16 +116,14 @@
'currentPrint': new Closure( 'currentPrint': new Closure(
function(MACHINE) { function(MACHINE) {
if(--MACHINE.callsBeforeTrampoline<0) { throw arguments.callee; } if(--MACHINE.callsBeforeTrampoline<0) { throw arguments.callee; }
var elt = MACHINE.env[MACHINE.env.length - 1];
var elt = MACHINE.env.pop();
var outputPort = var outputPort =
MACHINE.params.currentOutputPort; MACHINE.params.currentOutputPort;
if (elt !== VOID) { if (elt !== VOID) {
outputPort.writeDomNode(MACHINE, toDomNode(elt, 'print')); outputPort.writeDomNode(MACHINE, toDomNode(elt, 'print'));
outputPort.writeDomNode(MACHINE, toDomNode("\n", 'display')); outputPort.writeDomNode(MACHINE, toDomNode("\n", 'display'));
} }
var frame = MACHINE.control.pop(); return finalizeClosureCall(MACHINE, VOID);
return frame.label(MACHINE);
}, },
1, 1,
[], [],
@ -138,6 +136,52 @@
// Finalize the return from a closure. This is a helper function
// for those who implement Closures by hand.
//
// If used in the body of a Closure, it must be in tail
// position. This finishes the closure call, and does the following:
//
// * Clears out the existing arguments off the stack frame
// * Sets up the return value
// * Jumps either to the single-value return point, or the multiple-value
// return point.
//
// I'd personally love for this to be a macro and avoid the
// extra function call here.
var finalizeClosureCall = function(MACHINE) {
MACHINE.callsBeforeTrampoline--;
var frame, i, returnArgs = [].slice.call(arguments, 1);
// clear out stack space
// TODO: replace with a splice.
for(i = 0; i < MACHINE.argcount; i++) {
MACHINE.env.pop();
}
if (returnArgs.length === 1) {
MACHINE.val = returnArgs[0];
frame = MACHINE.control.pop();
return frame.label(MACHINE);
} else if (returnArgs.length === 0) {
MACHINE.argcount = 0;
frame = MACHINE.control.pop();
return frame.label.multipleValueReturn(MACHINE);
} else {
MACHINE.argcount = returnArgs.length;
MACHINE.val = returnArgs.shift();
// TODO: replace with a splice.
for(i = 0; i < MACHINE.argcount - 1; i++) {
MACHINE.env.push(returnArgs.pop());
}
frame = MACHINE.control.pop();
return frame.label.multipleValueReturn(MACHINE);
}
};
var ModuleRecord = function(name, label) { var ModuleRecord = function(name, label) {
this.name = name; this.name = name;
this.label = label; this.label = label;
@ -529,7 +573,7 @@
// Primitives are the set of primitive values. Not all primitives // Primitives are the set of primitive values. Not all primitives
// are coded here; several of them (including call/cc) are injected by // are coded here; several of them (including call/cc) are injected by
// the bootstrapping code. // the bootstrapping code in compiler/boostrapped-primitives.rkt
var Primitives = {}; var Primitives = {};
var installPrimitiveProcedure = function(name, arity, f) { var installPrimitiveProcedure = function(name, arity, f) {
@ -538,6 +582,12 @@
Primitives[name].displayName = name; Primitives[name].displayName = name;
}; };
var installPrimitiveClosure = function(name, arity, f) {
Primitives[name] =
new Closure(f, arity, [], name);
};
var makePrimitiveProcedure = function(name, arity, f) { var makePrimitiveProcedure = function(name, arity, f) {
f.arity = arity; f.arity = arity;
f.displayName = name; f.displayName = name;
@ -1998,66 +2048,100 @@
installPrimitiveClosure(
'make-struct-type',
makeList(4, 5, 6, 7, 8, 9, 10, 11),
function(MACHINE) {
// FIXME: we need to return those five values back.
finalizeClosureCall(MACHINE,
"type",
"constructor",
"predicate",
"accessor",
"mutator");
});
installPrimitiveProcedure(
'current-inspector',
makeList(0, 1),
function(MACHINE) {
return "inspector gadget";
}
);
installPrimitiveProcedure( installPrimitiveProcedure(
'make-struct-field-accessor', 'make-struct-field-accessor',
makeList(2, 3), makeList(2, 3),
function(MACHINE) { function(MACHINE){
return 'a procedure';
var accessor, fieldPos, fieldName;
accessor = MACHINE.env[MACHINE.env.length-1];
fieldPos = MACHINE.env[MACHINE.env.length-2];
if (MACHINE.argcount === 2) {
fieldName = 'field' + fieldPos;
} else {
fieldName = MACHINE.env[MACHINE.env.length-3];
}
testArgument(MACHINE,
'accessor procedure that requires a field index',
function(x) {
return (x instanceof types.StructAccessorProc &&
x.numParams > 1);
},
accessor,
0,
'make-struct-field-accessor');
testArgument(MACHINE,
'exact non-negative integer',
isNatural,
fieldPos,
'make-struct-field-accessor',
1)
testArgument(MACHINE,
'symbol or #f',
function(x) {
return x === false || isSymbol(x);
},
'make-struct-field-accessor',
fieldName,
2);
var procName = accessor.type.name + '-' fieldName;
return new types.StructAccessorProc(
accessor.type,
procName,
1,
false,
false,
function(MACHINE) {
testArgument(MACHINE,
'struct:' + accessor.type.name,
accessor.type.predicate,
MACHINE.env[MACHINE.env.length - 1],
procName,
0);
return accessor.impl(x, fieldPos);
});
}); });
// installPrimitiveProcedure(
// 'make-struct-field-accessor',
// makeList(2, 3),
// function(MACHINE) {
// var accessor, fieldPos, fieldName;
// accessor = MACHINE.env[MACHINE.env.length-1];
// fieldPos = MACHINE.env[MACHINE.env.length-2];
// if (MACHINE.argcount === 2) {
// fieldName = 'field' + fieldPos;
// } else {
// fieldName = MACHINE.env[MACHINE.env.length-3];
// }
// testArgument(MACHINE,
// 'accessor procedure that requires a field index',
// function(x) {
// return (x instanceof types.StructAccessorProc &&
// x.numParams > 1);
// },
// accessor,
// 0,
// 'make-struct-field-accessor');
// testArgument(MACHINE,
// 'exact non-negative integer',
// isNatural,
// fieldPos,
// 'make-struct-field-accessor',
// 1)
// testArgument(MACHINE,
// 'symbol or #f',
// function(x) {
// return x === false || isSymbol(x);
// },
// 'make-struct-field-accessor',
// fieldName,
// 2);
// var procName = accessor.type.name + '-' fieldName;
// return new types.StructAccessorProc(
// accessor.type,
// procName,
// 1,
// false,
// false,
// function(MACHINE) {
// testArgument(MACHINE,
// 'struct:' + accessor.type.name,
// accessor.type.predicate,
// MACHINE.env[MACHINE.env.length - 1],
// procName,
// 0);
// return accessor.impl(x, fieldPos);
// });
// });
@ -2328,6 +2412,7 @@
// installing new primitives // installing new primitives
exports['installPrimitiveProcedure'] = installPrimitiveProcedure; exports['installPrimitiveProcedure'] = installPrimitiveProcedure;
exports['installPrimitiveClosure'] = installPrimitiveClosure;
exports['makePrimitiveProcedure'] = makePrimitiveProcedure; exports['makePrimitiveProcedure'] = makePrimitiveProcedure;
exports['Primitives'] = Primitives; exports['Primitives'] = Primitives;
@ -2374,6 +2459,9 @@
exports['unspliceRestFromStack'] = unspliceRestFromStack; exports['unspliceRestFromStack'] = unspliceRestFromStack;
exports['finalizeClosureCall'] = finalizeClosureCall;
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

21
tests/more-tests/simple-structs.rkt
View File

@ -1,6 +1,21 @@
#lang planet dyoo/whalesong #lang planet dyoo/whalesong
(define-struct p (f r)) (define-struct p (f r))
(define p1 (make-p 3 4))
(p-f p1) "1"
(p-r p1) struct:p
"2"
make-p
"3"
p-f
"4"
p-r
"5"
p?
"6"
#;(define p1 (make-p 3 4))
#;(p-f p1)
#;(p-r p1)