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

renamed proc to p

Browse Source
This commit is contained in:
Danny Yoo 2011-09-14 23:50:02 -04:00
parent e0f2502b18
commit a107d83827
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js-assembler/assemble-expression.rkt
View File

@ -14,7 +14,7 @@
(define (assemble-op-expression op) (define (assemble-op-expression op)
(cond (cond
[(GetCompiledProcedureEntry? op) [(GetCompiledProcedureEntry? op)
"M.proc.label"] "M.p.label"]
[(MakeCompiledProcedure? op) [(MakeCompiledProcedure? op)
(format "new RT.Closure(~a,~a,[~a],~a)" (format "new RT.Closure(~a,~a,[~a],~a)"

4
js-assembler/assemble-helpers.rkt
View File

@ -83,7 +83,7 @@
(format "~a=~a;" (format "~a=~a;"
(cond (cond
[(eq? target 'proc) [(eq? target 'proc)
"M.proc"] "M.p"]
[(eq? target 'val) [(eq? target 'val)
"M.val"] "M.val"]
[(eq? target 'argcount) [(eq? target 'argcount)
@ -279,7 +279,7 @@
(let ([name (Reg-name a-reg)]) (let ([name (Reg-name a-reg)])
(cond (cond
[(eq? name 'proc) [(eq? name 'proc)
"M.proc"] "M.p"]
[(eq? name 'val) [(eq? name 'val)
"M.val"] "M.val"]
[(eq? name 'argcount) [(eq? name 'argcount)

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

@ -70,7 +70,7 @@
",")))] ",")))]
[(InstallClosureValues!? op) [(InstallClosureValues!? op)
"M.e.push.apply(M.e,M.proc.closedVals);"] "M.e.push.apply(M.e,M.p.closedVals);"]
[(RestoreEnvironment!? op) [(RestoreEnvironment!? op)
"M.e=M.e[M.e.length-2].slice(0);"] "M.e=M.e[M.e.length-2].slice(0);"]
@ -98,7 +98,7 @@
","))] ","))]
[(SetFrameCallee!? op) [(SetFrameCallee!? op)
(format "M.c[M.c.length-1].proc=~a;" (format "M.c[M.c.length-1].p=~a;"
(assemble-oparg (SetFrameCallee!-proc op)))] (assemble-oparg (SetFrameCallee!-proc op)))]
[(SpliceListIntoStack!? op) [(SpliceListIntoStack!? op)

2
js-assembler/assemble.rkt
View File

@ -486,7 +486,7 @@ EOF
"M.c.push(new RT.Frame());"] "M.c.push(new RT.Frame());"]
[(PushControlFrame/Call? stmt) [(PushControlFrame/Call? stmt)
(format "M.c.push(new RT.CallFrame(~a,M.proc));" (format "M.c.push(new RT.CallFrame(~a,M.p));"
(let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Call-label stmt)]) (let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Call-label stmt)])
(cond (cond
[(symbol? label) [(symbol? label)

2
js-assembler/runtime-src/baselib-frames.js
View File

@ -31,7 +31,7 @@
// as well as the function being called. // as well as the function being called.
var CallFrame = function(label, proc) { var CallFrame = function(label, proc) {
this.label = label; this.label = label;
this.proc = proc; this.p = proc;
// The set of continuation marks. // The set of continuation marks.
this.marks = []; this.marks = [];

20
js-assembler/runtime-src/baselib-functions.js
View File

@ -150,7 +150,7 @@
var oldVal = MACHINE.val; var oldVal = MACHINE.val;
var oldArgcount = MACHINE.a; var oldArgcount = MACHINE.a;
var oldProc = MACHINE.proc; var oldProc = MACHINE.p;
var oldErrorHandler = MACHINE.params['currentErrorHandler']; var oldErrorHandler = MACHINE.params['currentErrorHandler'];
var afterGoodInvoke = function (MACHINE) { var afterGoodInvoke = function (MACHINE) {
@ -160,7 +160,7 @@
var returnValue = MACHINE.val; var returnValue = MACHINE.val;
MACHINE.val = oldVal; MACHINE.val = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.proc = oldProc; MACHINE.p = oldProc;
succ(returnValue); succ(returnValue);
}); });
}; };
@ -174,7 +174,7 @@
} }
MACHINE.val = oldVal; MACHINE.val = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.proc = oldProc; MACHINE.p = oldProc;
succ.apply(null, returnValues); succ.apply(null, returnValues);
}); });
}; };
@ -186,12 +186,12 @@
for (i = 0; i < arguments.length - 2; i++) { for (i = 0; i < arguments.length - 2; i++) {
MACHINE.e.push(arguments[arguments.length - 1 - i]); MACHINE.e.push(arguments[arguments.length - 1 - i]);
} }
MACHINE.proc = v; MACHINE.p = v;
MACHINE.params['currentErrorHandler'] = function (MACHINE, e) { MACHINE.params['currentErrorHandler'] = function (MACHINE, e) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler; MACHINE.params['currentErrorHandler'] = oldErrorHandler;
MACHINE.val = oldVal; MACHINE.val = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.proc = oldProc; MACHINE.p = oldProc;
fail(e); fail(e);
}; };
MACHINE.trampoline(v.label); MACHINE.trampoline(v.label);
@ -248,7 +248,7 @@
} else if (isClosure(proc)) { } else if (isClosure(proc)) {
oldVal = MACHINE.val; oldVal = MACHINE.val;
oldArgcount = MACHINE.a; oldArgcount = MACHINE.a;
oldProc = MACHINE.proc; oldProc = MACHINE.p;
oldErrorHandler = MACHINE.params['currentErrorHandler']; oldErrorHandler = MACHINE.params['currentErrorHandler'];
var afterGoodInvoke = function (MACHINE) { var afterGoodInvoke = function (MACHINE) {
@ -257,7 +257,7 @@
var returnValue = MACHINE.val; var returnValue = MACHINE.val;
MACHINE.val = oldVal; MACHINE.val = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.proc = oldProc; MACHINE.p = oldProc;
success(returnValue); success(returnValue);
}); });
}; };
@ -271,7 +271,7 @@
} }
MACHINE.val = oldVal; MACHINE.val = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.proc = oldProc; MACHINE.p = oldProc;
success.apply(null, returnValues); success.apply(null, returnValues);
}); });
}; };
@ -282,12 +282,12 @@
for (i = 0; i < arguments.length - 4; i++) { for (i = 0; i < arguments.length - 4; i++) {
MACHINE.e.push(arguments[arguments.length - 1 - i]); MACHINE.e.push(arguments[arguments.length - 1 - i]);
} }
MACHINE.proc = proc; MACHINE.p = proc;
MACHINE.params['currentErrorHandler'] = function (MACHINE, e) { MACHINE.params['currentErrorHandler'] = function (MACHINE, e) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler; MACHINE.params['currentErrorHandler'] = oldErrorHandler;
MACHINE.val = oldVal; MACHINE.val = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.proc = oldProc; MACHINE.p = oldProc;
fail(e); fail(e);
}; };
MACHINE.trampoline(proc.label); MACHINE.trampoline(proc.label);

2
js-assembler/runtime-src/baselib-primitives.js
View File

@ -1150,7 +1150,7 @@
checkList(M, 'apply', M.a - 1); checkList(M, 'apply', M.a - 1);
M.spliceListIntoStack(M.a - 1); M.spliceListIntoStack(M.a - 1);
if (baselib.arity.isArityMatching(proc.racketArity, M.a)) { if (baselib.arity.isArityMatching(proc.racketArity, M.a)) {
M.proc = proc; M.p = proc;
if (baselib.functions.isPrimitiveProcedure(proc)) { if (baselib.functions.isPrimitiveProcedure(proc)) {
return finalizeClosureCall(M, proc(M)); return finalizeClosureCall(M, proc(M));
} else { } else {

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

@ -213,7 +213,7 @@
var Machine = function() { var Machine = function() {
this.cbt = STACK_LIMIT_ESTIMATE; // calls before trampoline this.cbt = STACK_LIMIT_ESTIMATE; // calls before trampoline
this.val = undefined; // value register this.val = undefined; // value register
this.proc = undefined; // procedure register this.p = undefined; // procedure register
this.a = undefined; // argument count this.a = undefined; // argument count
this.e = []; // environment this.e = []; // environment
this.c = []; // control: Arrayof (U Frame CallFrame PromptFrame) this.c = []; // control: Arrayof (U Frame CallFrame PromptFrame)
@ -384,8 +384,8 @@
if (tracedCalleeKey !== null && if (tracedCalleeKey !== null &&
control[i] instanceof CallFrame && control[i] instanceof CallFrame &&
control[i].proc !== null) { control[i].p !== null) {
kvLists.push([[tracedCalleeKey, control[i].proc]]); kvLists.push([[tracedCalleeKey, control[i].p]]);
} }
} }
return new baselib.contmarks.ContinuationMarkSet(kvLists); return new baselib.contmarks.ContinuationMarkSet(kvLists);
@ -656,11 +656,11 @@
var checkClosureAndArity = function(M) { var checkClosureAndArity = function(M) {
if(!(M.proc instanceof Closure)){ if(!(M.p instanceof Closure)){
raiseOperatorIsNotClosure(M,M.proc); raiseOperatorIsNotClosure(M,M.p);
} }
if(!isArityMatching(M.proc.racketArity,M.a)) { if(!isArityMatching(M.p.racketArity,M.a)) {
raiseArityMismatchError(M, M.proc,M.a); raiseArityMismatchError(M,M.p,M.a);
} }
}; };