renaming multipleValueReturn to mvr

This commit is contained in:
Danny Yoo 2011-09-14 21:22:46 -04:00
parent f89ad56560
commit 298ade1752
3 changed files with 7 additions and 6 deletions

View File

@ -311,7 +311,7 @@
(: assemble-control-stack-label/multiple-value-return (ControlStackLabel/MultipleValueReturn -> String)) (: assemble-control-stack-label/multiple-value-return (ControlStackLabel/MultipleValueReturn -> String))
(define (assemble-control-stack-label/multiple-value-return a-csl) (define (assemble-control-stack-label/multiple-value-return a-csl)
"M.control[M.control.length-1].label.multipleValueReturn") "M.control[M.control.length-1].label.mvr")

View File

@ -139,7 +139,8 @@ EOF
[(symbol? stmt) [(symbol? stmt)
(next)] (next)]
[(LinkedLabel? stmt) [(LinkedLabel? stmt)
(fprintf op "~a.multipleValueReturn=~a;\n" ;; Setting up multiple-value-return
(fprintf op "~a.mvr=~a;\n"
(assemble-label (make-Label (LinkedLabel-label stmt))) (assemble-label (make-Label (LinkedLabel-label stmt)))
(assemble-label (make-Label (LinkedLabel-linked-to stmt)))) (assemble-label (make-Label (LinkedLabel-linked-to stmt))))
(next)] (next)]

View File

@ -72,12 +72,12 @@
return MACHINE.control.pop().label(MACHINE); return MACHINE.control.pop().label(MACHINE);
} else if (returnArgs.length === 0) { } else if (returnArgs.length === 0) {
MACHINE.argcount = 0; MACHINE.argcount = 0;
return MACHINE.control.pop().label.multipleValueReturn(MACHINE); return MACHINE.control.pop().label.mvr(MACHINE);
} else { } else {
MACHINE.argcount = returnArgs.length; MACHINE.argcount = returnArgs.length;
MACHINE.val = returnArgs.shift(); MACHINE.val = returnArgs.shift();
MACHINE.env.push.apply(MACHINE.env, returnArgs.reverse()); MACHINE.env.push.apply(MACHINE.env, returnArgs.reverse());
return MACHINE.control.pop().label.multipleValueReturn(MACHINE); return MACHINE.control.pop().label.mvr(MACHINE);
} }
}; };
@ -164,7 +164,7 @@
succ(returnValue); succ(returnValue);
}); });
}; };
afterGoodInvoke.multipleValueReturn = function (MACHINE) { afterGoodInvoke.mvr = function (MACHINE) {
plt.runtime.PAUSE( plt.runtime.PAUSE(
function (restart) { function (restart) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler; MACHINE.params['currentErrorHandler'] = oldErrorHandler;
@ -261,7 +261,7 @@
success(returnValue); success(returnValue);
}); });
}; };
afterGoodInvoke.multipleValueReturn = function (MACHINE) { afterGoodInvoke.mvr = function (MACHINE) {
plt.runtime.PAUSE(function (restart) { plt.runtime.PAUSE(function (restart) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler; MACHINE.params['currentErrorHandler'] = oldErrorHandler;
var returnValues = [MACHINE.val]; var returnValues = [MACHINE.val];