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-PopControlFrame)
#;(make-DebugPrint (make-Const "Returning from module invokation.")) #;(make-DebugPrint (make-Const "Returning from module invokation."))
#;(make-DebugPrint (make-Reg 'proc)) #;(make-DebugPrint (make-Reg 'proc))
(make-PerformStatement (make-FinalizeModuleInvokation! path))
(make-GotoStatement (make-Reg 'proc)) (make-GotoStatement (make-Reg 'proc))
after-module-body)))])) after-module-body)))]))

2
compiler/kernel-primitives.rkt
View File

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

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

@ -158,4 +158,6 @@
(symbol->string (ModuleLocator-name (AliasModuleName!-from op))))] (symbol->string (ModuleLocator-name (AliasModuleName!-from op))))]
[(FinalizeModuleInvokation!? 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['current-print'] = function(MACHINE) {
Primitives['print-values'] = new Closure( return new Closure(
function(MACHINE) { function(MACHINE) {
var outputPort = MACHINE.params.currentOutputPort; var elt = MACHINE.env.pop();
var prependNewline = false; var outputPort = MACHINE.params.currentOutputPort;
if (MACHINE.argcount > 0) { outputPort.write(MACHINE, elt);
if (MACHINE.val !== undefined) { var frame = MACHINE.control.pop();
if (prependNewline) { return frame.label(MACHINE);
outputPort.write(MACHINE, "\n"); },
} 1,
outputPort.write(MACHINE, MACHINE.val); [],
prependNewline = true; "printer")
} };
for(var i = 0; i < MACHINE.argcount - 1; i++) { // // This should be attached to the module corresponding for print-values
if (MACHINE.env[MACHINE.env.length - 1 - i] !== undefined) { // Primitives['print-values'] = new Closure(
if (prependNewline) { // function(MACHINE) {
outputPort.write(MACHINE, "\n"); // var outputPort = MACHINE.params.currentOutputPort;
} // var prependNewline = false;
outputPort.write(MACHINE, // if (MACHINE.argcount > 0) {
MACHINE.env[MACHINE.env.length - 1 - i]); // if (MACHINE.val !== undefined) {
prependNewline = true; // if (prependNewline) {
} // outputPort.write(MACHINE, "\n");
} // }
outputPort.write(MACHINE, "\n"); // outputPort.write(MACHINE, MACHINE.val);
} // prependNewline = true;
MACHINE.env.length = MACHINE.env.length - MACHINE.argcount; // }
var frame = MACHINE.control.pop();
return frame.label(MACHINE); // for(var i = 0; i < MACHINE.argcount - 1; i++) {
}, // if (MACHINE.env[MACHINE.env.length - 1 - i] !== undefined) {
new ArityAtLeast(0), // if (prependNewline) {
[], // outputPort.write(MACHINE, "\n");
"print-values" // }
); // 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. ;; FIXME: Finally, invoke the main module.
(fprintf op #<<EOF (display (quote-as-cdata #<<EOF
var invokeMainModule = function() { var invokeMainModule = function() {
var MACHINE = new plt.runtime.Machine(); var MACHINE = new plt.runtime.Machine();
@ -124,9 +124,6 @@ var invokeMainModule = function() {
} }
}); });
}; };
</script>
<body onload='invokeMainModule()'>
</body>
</html>
EOF 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)