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

trying to trace issue with arity matching

Browse Source
This commit is contained in:
Danny Yoo 2011-05-27 11:08:33 -04:00
parent 04eb3454ae
commit 702337f6f9
6 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/compiler.rkt
View File

@ -362,6 +362,8 @@
(make-PopControlFrame)
#;(make-DebugPrint (make-Const "Returning from module invokation."))
#;(make-DebugPrint (make-Reg 'proc))
(make-PerformStatement (make-FinalizeModuleInvokation! path))
(make-GotoStatement (make-Reg 'proc))
after-module-body)))]))

2
compiler/kernel-primitives.rkt
View File

@ -62,6 +62,8 @@
'apply
'for-each
'current-print
))
(define-predicate KernelPrimitiveName? KernelPrimitiveName)

4
js-assembler/assemble-perform-statement.rkt
View File

@ -158,4 +158,6 @@
(symbol->string (ModuleLocator-name (AliasModuleName!-from op))))]
[(FinalizeModuleInvokation!? op)
(format "MACHINE.modules[~s].finalizeModuleInvokation();")]))
(format "MACHINE.modules[~s].finalizeModuleInvokation();"
(symbol->string
(ModuleLocator-name (FinalizeModuleInvokation!-path op))))]))

80
js-assembler/mini-runtime.js
View File

@ -496,40 +496,54 @@
// This should be attached to the module corresponding for print-values
Primitives['print-values'] = new Closure(
function(MACHINE) {
var outputPort = MACHINE.params.currentOutputPort;
var prependNewline = false;
if (MACHINE.argcount > 0) {
if (MACHINE.val !== undefined) {
if (prependNewline) {
outputPort.write(MACHINE, "\n");
}
outputPort.write(MACHINE, MACHINE.val);
prependNewline = true;
}
Primitives['current-print'] = function(MACHINE) {
return new Closure(
function(MACHINE) {
var elt = MACHINE.env.pop();
var outputPort = MACHINE.params.currentOutputPort;
outputPort.write(MACHINE, elt);
var frame = MACHINE.control.pop();
return frame.label(MACHINE);
},
1,
[],
"printer")
};
for(var i = 0; i < MACHINE.argcount - 1; i++) {
if (MACHINE.env[MACHINE.env.length - 1 - i] !== undefined) {
if (prependNewline) {
outputPort.write(MACHINE, "\n");
}
outputPort.write(MACHINE,
MACHINE.env[MACHINE.env.length - 1 - i]);
prependNewline = true;
}
}
outputPort.write(MACHINE, "\n");
}
MACHINE.env.length = MACHINE.env.length - MACHINE.argcount;
var frame = MACHINE.control.pop();
return frame.label(MACHINE);
},
new ArityAtLeast(0),
[],
"print-values"
);
// // This should be attached to the module corresponding for print-values
// Primitives['print-values'] = new Closure(
// function(MACHINE) {
// var outputPort = MACHINE.params.currentOutputPort;
// var prependNewline = false;
// if (MACHINE.argcount > 0) {
// if (MACHINE.val !== undefined) {
// if (prependNewline) {
// outputPort.write(MACHINE, "\n");
// }
// outputPort.write(MACHINE, MACHINE.val);
// prependNewline = true;
// }
// for(var i = 0; i < MACHINE.argcount - 1; i++) {
// if (MACHINE.env[MACHINE.env.length - 1 - i] !== undefined) {
// if (prependNewline) {
// outputPort.write(MACHINE, "\n");
// }
// outputPort.write(MACHINE,
// MACHINE.env[MACHINE.env.length - 1 - i]);
// prependNewline = true;
// }
// }
// outputPort.write(MACHINE, "\n");
// }
// MACHINE.env.length = MACHINE.env.length - MACHINE.argcount;
// var frame = MACHINE.control.pop();
// return frame.label(MACHINE);
// },
// new ArityAtLeast(0),
// [],
// "print-values"
// );

9
js-assembler/package.rkt
View File

@ -92,7 +92,7 @@ EOF
;; FIXME: Finally, invoke the main module.
(fprintf op #<<EOF
(display (quote-as-cdata #<<EOF
var invokeMainModule = function() {
var MACHINE = new plt.runtime.Machine();
@ -124,9 +124,6 @@ var invokeMainModule = function() {
}
});
};
</script>
<body onload='invokeMainModule()'>
</body>
</html>
EOF
))
) op)
(display " </script>\n<body onload='invokeMainModule()'>\n</body>\n</html>" op))

3
lang/base.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang s-exp "kernel.rkt"
(provide (all-from-out "kernel.rkt"))
(require racket/private/modbeg)