From f3afee28e97f30e2de0c87376070110ae62c2ac7 Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Mon, 8 Aug 2011 11:04:53 -0400 Subject: [PATCH] correcting merge issues --- js-assembler/assemble.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js-assembler/assemble.rkt b/js-assembler/assemble.rkt index 54d04cb..f5d9b9b 100644 --- a/js-assembler/assemble.rkt +++ b/js-assembler/assemble.rkt @@ -59,7 +59,7 @@ for (param in params) { } EOF ) - (fprintf op "RUNTIME.trampoline(MACHINE, ~a); })" + (fprintf op "MACHINE.trampoline(~a); })" (assemble-label (make-Label (BasicBlock-name (first basic-blocks))))))