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

renaming RUNTIME references to RT to see if that shortens code.

Browse Source
This commit is contained in:
Danny Yoo 2011-09-08 17:10:16 -04:00
parent 418943d8ec
commit 11799d3a9c
6 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
"MACHINE.proc.label"] "MACHINE.proc.label"]
[(MakeCompiledProcedure? op) [(MakeCompiledProcedure? op)
(format "new RUNTIME.Closure(~a, ~a, [~a], ~a)" (format "new RT.Closure(~a, ~a, [~a], ~a)"
(assemble-label (make-Label (MakeCompiledProcedure-label op))) (assemble-label (make-Label (MakeCompiledProcedure-label op)))
(assemble-arity (MakeCompiledProcedure-arity op)) (assemble-arity (MakeCompiledProcedure-arity op))
(string-join (map (string-join (map
@ -31,7 +31,7 @@
(assemble-display-name (MakeCompiledProcedure-display-name op)))] (assemble-display-name (MakeCompiledProcedure-display-name op)))]
[(MakeCompiledProcedureShell? op) [(MakeCompiledProcedureShell? op)
(format "new RUNTIME.Closure(~a, ~a, undefined, ~a)" (format "new RT.Closure(~a, ~a, undefined, ~a)"
(assemble-label (make-Label (MakeCompiledProcedureShell-label op))) (assemble-label (make-Label (MakeCompiledProcedureShell-label op)))
(assemble-arity (MakeCompiledProcedureShell-arity op)) (assemble-arity (MakeCompiledProcedureShell-arity op))
(assemble-display-name (MakeCompiledProcedureShell-display-name op)))] (assemble-display-name (MakeCompiledProcedureShell-display-name op)))]

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

@ -74,7 +74,7 @@
(cond (cond
[(PrimitivesReference? target) [(PrimitivesReference? target)
(lambda: ([rhs : String]) (lambda: ([rhs : String])
(format "RUNTIME.Primitives[~s]=RUNTIME.Primitives[~s]||~a;" (format "RT.Primitives[~s]=RT.Primitives[~s]||~a;"
(symbol->string (PrimitivesReference-name target)) (symbol->string (PrimitivesReference-name target))
(symbol->string (PrimitivesReference-name target)) (symbol->string (PrimitivesReference-name target))
rhs))] rhs))]
@ -111,38 +111,38 @@
(define (assemble-const stmt) (define (assemble-const stmt)
(let: loop : String ([val : const-value (Const-const stmt)]) (let: loop : String ([val : const-value (Const-const stmt)])
(cond [(symbol? val) (cond [(symbol? val)
(format "RUNTIME.makeSymbol(~s)" (symbol->string val))] (format "RT.makeSymbol(~s)" (symbol->string val))]
[(pair? val) [(pair? val)
(format "RUNTIME.makePair(~a,~a)" (format "RT.makePair(~a,~a)"
(loop (car val)) (loop (car val))
(loop (cdr val)))] (loop (cdr val)))]
[(boolean? val) [(boolean? val)
(if val "true" "false")] (if val "true" "false")]
[(void? val) [(void? val)
"RUNTIME.VOID"] "RT.VOID"]
[(empty? val) [(empty? val)
(format "RUNTIME.NULL")] (format "RT.NULL")]
[(number? val) [(number? val)
(assemble-numeric-constant val)] (assemble-numeric-constant val)]
[(string? val) [(string? val)
(format "~s" val)] (format "~s" val)]
[(char? val) [(char? val)
(format "RUNTIME.makeChar(~s)" (string val))] (format "RT.makeChar(~s)" (string val))]
[(bytes? val) [(bytes? val)
(format "RUNTIME.makeBytes(~a)" (format "RT.makeBytes(~a)"
(string-join (for/list ([a-byte val]) (string-join (for/list ([a-byte val])
(number->string a-byte)) (number->string a-byte))
","))] ","))]
[(path? val) [(path? val)
(format "RUNTIME.makePath(~s)" (format "RT.makePath(~s)"
(path->string val))] (path->string val))]
[(vector? val) [(vector? val)
(format "RUNTIME.makeVector(~a)" (format "RT.makeVector(~a)"
(string-join (for/list ([elt (vector->list val)]) (string-join (for/list ([elt (vector->list val)])
(loop elt)) (loop elt))
","))] ","))]
[(box? val) [(box? val)
(format "RUNTIME.makeBox(~s)" (format "RT.makeBox(~s)"
(loop (unbox val)))]))) (loop (unbox val)))])))
@ -152,9 +152,9 @@
(let loop ([vals vals]) (let loop ([vals vals])
(cond (cond
[(empty? vals) [(empty? vals)
"RUNTIME.NULL"] "RT.NULL"]
[else [else
(format "RUNTIME.makePair(~a,~a)" (first vals) (loop (rest vals)))]))) (format "RT.makePair(~a,~a)" (first vals) (loop (rest vals)))])))
@ -171,15 +171,15 @@
(define (floating-number->js a-num) (define (floating-number->js a-num)
(cond (cond
[(eqv? a-num -0.0) [(eqv? a-num -0.0)
"RUNTIME.NEGATIVE_ZERO"] "RT.NEGATIVE_ZERO"]
[(eqv? a-num +inf.0) [(eqv? a-num +inf.0)
"RUNTIME.INF"] "RT.INF"]
[(eqv? a-num -inf.0) [(eqv? a-num -inf.0)
"RUNTIME.NEGATIVE_INF"] "RT.NEGATIVE_INF"]
[(eqv? a-num +nan.0) [(eqv? a-num +nan.0)
"RUNTIME.NAN"] "RT.NAN"]
[else [else
(string-append "RUNTIME.makeFloat(" (number->string a-num) ")")])) (string-append "RT.makeFloat(" (number->string a-num) ")")]))
;; FIXME: fix the type signature when typed-racket isn't breaking on ;; FIXME: fix the type signature when typed-racket isn't breaking on
;; (define-predicate ExactRational? (U Exact-Rational)) ;; (define-predicate ExactRational? (U Exact-Rational))
@ -188,7 +188,7 @@
(cond [(= (denominator a-num) 1) (cond [(= (denominator a-num) 1)
(string-append (integer->js (ensure-integer (numerator a-num))))] (string-append (integer->js (ensure-integer (numerator a-num))))]
[else [else
(string-append "RUNTIME.makeRational(" (string-append "RT.makeRational("
(integer->js (ensure-integer (numerator a-num))) (integer->js (ensure-integer (numerator a-num)))
"," ","
(integer->js (ensure-integer (denominator a-num))) (integer->js (ensure-integer (denominator a-num)))
@ -211,7 +211,7 @@
(number->string an-int)] (number->string an-int)]
;; overflow case ;; overflow case
[else [else
(string-append "RUNTIME.makeBignum(" (string-append "RT.makeBignum("
(format "~s" (number->string an-int)) (format "~s" (number->string an-int))
")")])) ")")]))
@ -223,7 +223,7 @@
(floating-number->js a-num)] (floating-number->js a-num)]
[(complex? a-num) [(complex? a-num)
(string-append "RUNTIME.makeComplex(" (string-append "RT.makeComplex("
(assemble-numeric-constant (real-part a-num)) (assemble-numeric-constant (real-part a-num))
"," ","
(assemble-numeric-constant (imag-part a-num)) (assemble-numeric-constant (imag-part a-num))
@ -328,7 +328,7 @@
(: assemble-default-continuation-prompt-tag (-> String)) (: assemble-default-continuation-prompt-tag (-> String))
(define (assemble-default-continuation-prompt-tag) (define (assemble-default-continuation-prompt-tag)
"RUNTIME.DEFAULT_CONTINUATION_PROMPT_TAG") "RT.DEFAULT_CONTINUATION_PROMPT_TAG")
@ -350,7 +350,7 @@
[(natural? an-arity) [(natural? an-arity)
(number->string an-arity)] (number->string an-arity)]
[(ArityAtLeast? an-arity) [(ArityAtLeast? an-arity)
(format "(RUNTIME.makeArityAtLeast(~a))" (format "(RT.makeArityAtLeast(~a))"
(ArityAtLeast-value an-arity))] (ArityAtLeast-value an-arity))]
[(listof-atomic-arity? an-arity) [(listof-atomic-arity? an-arity)
(assemble-listof-assembled-values (assemble-listof-assembled-values
@ -360,7 +360,7 @@
[(natural? atomic-arity) [(natural? atomic-arity)
(number->string atomic-arity)] (number->string atomic-arity)]
[(ArityAtLeast? atomic-arity) [(ArityAtLeast? atomic-arity)
(format "(RUNTIME.makeArityAtLeast(~a))" (format "(RT.makeArityAtLeast(~a))"
(ArityAtLeast-value atomic-arity))])) (ArityAtLeast-value atomic-arity))]))
an-arity))])) an-arity))]))
@ -425,6 +425,6 @@
(: assemble-variable-reference (VariableReference -> String)) (: assemble-variable-reference (VariableReference -> String))
(define (assemble-variable-reference varref) (define (assemble-variable-reference varref)
(let ([t (VariableReference-toplevel varref)]) (let ([t (VariableReference-toplevel varref)])
(format "(new RUNTIME.VariableReference(MACHINE.env[MACHINE.env.length-~a],~a))" (format "(new RT.VariableReference(MACHINE.env[MACHINE.env.length-~a],~a))"
(add1 (ToplevelRef-depth t)) (add1 (ToplevelRef-depth t))
(ToplevelRef-pos t)))) (ToplevelRef-pos t))))

20
js-assembler/assemble-open-coded.rkt
View File

@ -70,7 +70,7 @@
(assemble-boolean-chain "plt.baselib.numbers.greaterThanOrEqual" checked-operands)] (assemble-boolean-chain "plt.baselib.numbers.greaterThanOrEqual" checked-operands)]
[(cons) [(cons)
(format "RUNTIME.makePair(~a, ~a)" (format "RT.makePair(~a, ~a)"
(first checked-operands) (first checked-operands)
(second checked-operands))] (second checked-operands))]
@ -85,15 +85,15 @@
(assemble-listof-assembled-values checked-operands))] (assemble-listof-assembled-values checked-operands))]
[(list?) [(list?)
(format "RUNTIME.isList(~a)" (format "RT.isList(~a)"
(first checked-operands))] (first checked-operands))]
[(pair?) [(pair?)
(format "RUNTIME.isPair(~a)" (format "RT.isPair(~a)"
(first checked-operands))] (first checked-operands))]
[(null?) [(null?)
(format "(~a === RUNTIME.NULL)" (first checked-operands))] (format "(~a === RT.NULL)" (first checked-operands))]
[(not) [(not)
(format "(~a === false)" (first checked-operands))] (format "(~a === false)" (first checked-operands))]
@ -154,16 +154,16 @@
(let: ([predicate : String (let: ([predicate : String
(case domain (case domain
[(number) [(number)
(format "RUNTIME.isNumber")] (format "RT.isNumber")]
[(string) [(string)
(format "RUNTIME.isString")] (format "RT.isString")]
[(list) [(list)
(format "RUNTIME.isList")] (format "RT.isList")]
[(pair) [(pair)
(format "RUNTIME.isPair")] (format "RT.isPair")]
[(box) [(box)
(format "RUNTIME.isBox")])]) (format "RT.isBox")])])
(format "RUNTIME.testArgument(MACHINE, ~s, ~a, ~a, ~a, ~s)" (format "RT.testArgument(MACHINE, ~s, ~a, ~a, ~a, ~s)"
(symbol->string domain) (symbol->string domain)
predicate predicate
operand-string operand-string

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

@ -14,7 +14,7 @@
(cond (cond
[(CheckToplevelBound!? op) [(CheckToplevelBound!? op)
(format "if (MACHINE.env[MACHINE.env.length - 1 - ~a][~a] === undefined) { RUNTIME.raiseUnboundToplevelError(MACHINE.env[MACHINE.env.length - 1 - ~a].names[~a]); }" (format "if (MACHINE.env[MACHINE.env.length - 1 - ~a][~a] === undefined) { RT.raiseUnboundToplevelError(MACHINE.env[MACHINE.env.length - 1 - ~a].names[~a]); }"
(CheckToplevelBound!-depth op) (CheckToplevelBound!-depth op)
(CheckToplevelBound!-pos op) (CheckToplevelBound!-pos op)
(CheckToplevelBound!-depth op) (CheckToplevelBound!-depth op)
@ -22,13 +22,13 @@
[(CheckClosureArity!? op) [(CheckClosureArity!? op)
(format "if(!(MACHINE.proc instanceof RUNTIME.Closure)){RUNTIME.raiseOperatorIsNotClosure(MACHINE,MACHINE.proc);}if(!RUNTIME.isArityMatching(MACHINE.proc.racketArity,~a)){RUNTIME.raiseArityMismatchError(MACHINE, MACHINE.proc,~a);}" (format "if(!(MACHINE.proc instanceof RT.Closure)){RT.raiseOperatorIsNotClosure(MACHINE,MACHINE.proc);}if(!RT.isArityMatching(MACHINE.proc.racketArity,~a)){RT.raiseArityMismatchError(MACHINE, MACHINE.proc,~a);}"
(assemble-oparg (CheckClosureArity!-num-args op)) (assemble-oparg (CheckClosureArity!-num-args op))
(assemble-oparg (CheckClosureArity!-num-args op)))] (assemble-oparg (CheckClosureArity!-num-args op)))]
[(CheckPrimitiveArity!? op) [(CheckPrimitiveArity!? op)
(format "if(!RUNTIME.isArityMatching(MACHINE.proc.racketArity,~a)){RUNTIME.raiseArityMismatchError(MACHINE,MACHINE.proc,~a);}" (format "if(!RT.isArityMatching(MACHINE.proc.racketArity,~a)){RT.raiseArityMismatchError(MACHINE,MACHINE.proc,~a);}"
(assemble-oparg (CheckPrimitiveArity!-num-args op)) (assemble-oparg (CheckPrimitiveArity!-num-args op))
(assemble-oparg (CheckPrimitiveArity!-num-args op)))] (assemble-oparg (CheckPrimitiveArity!-num-args op)))]
@ -125,28 +125,28 @@
"MACHINE.val);")] "MACHINE.val);")]
[(RaiseContextExpectedValuesError!? op) [(RaiseContextExpectedValuesError!? op)
(format "RUNTIME.raiseContextExpectedValuesError(MACHINE,~a);" (format "RT.raiseContextExpectedValuesError(MACHINE,~a);"
(RaiseContextExpectedValuesError!-expected op))] (RaiseContextExpectedValuesError!-expected op))]
[(RaiseArityMismatchError!? op) [(RaiseArityMismatchError!? op)
(format "RUNTIME.raiseArityMismatchError(MACHINE,~a,~a);" (format "RT.raiseArityMismatchError(MACHINE,~a,~a);"
(assemble-oparg (RaiseArityMismatchError!-proc op)) (assemble-oparg (RaiseArityMismatchError!-proc op))
(assemble-oparg (RaiseArityMismatchError!-received op)))] (assemble-oparg (RaiseArityMismatchError!-received op)))]
[(RaiseOperatorApplicationError!? op) [(RaiseOperatorApplicationError!? op)
(format "RUNTIME.raiseOperatorApplicationError(MACHINE,~a);" (format "RT.raiseOperatorApplicationError(MACHINE,~a);"
(assemble-oparg (RaiseOperatorApplicationError!-operator op)))] (assemble-oparg (RaiseOperatorApplicationError!-operator op)))]
[(RaiseUnimplementedPrimitiveError!? op) [(RaiseUnimplementedPrimitiveError!? op)
(format "RUNTIME.raiseUnimplementedPrimitiveError(MACHINE,~s);" (format "RT.raiseUnimplementedPrimitiveError(MACHINE,~s);"
(symbol->string (RaiseUnimplementedPrimitiveError!-name op)))] (symbol->string (RaiseUnimplementedPrimitiveError!-name op)))]
[(InstallModuleEntry!? op) [(InstallModuleEntry!? op)
(format "MACHINE.modules[~s]=new RUNTIME.ModuleRecord(~s,~a);" (format "MACHINE.modules[~s]=new RT.ModuleRecord(~s,~a);"
(symbol->string (ModuleLocator-name (InstallModuleEntry!-path op))) (symbol->string (ModuleLocator-name (InstallModuleEntry!-path op)))
(symbol->string (InstallModuleEntry!-name op)) (symbol->string (InstallModuleEntry!-name op))
(assemble-label (make-Label (InstallModuleEntry!-entry-point op))))] (assemble-label (make-Label (InstallModuleEntry!-entry-point op))))]

12
js-assembler/assemble.rkt
View File

@ -41,7 +41,7 @@
(define (assemble/write-invoke stmts op) (define (assemble/write-invoke stmts op)
(display "(function(MACHINE, success, fail, params) {\n" op) (display "(function(MACHINE, success, fail, params) {\n" op)
(display "var param;\n" op) (display "var param;\n" op)
(display "var RUNTIME = plt.runtime;\n" op) (display "var RT = plt.runtime;\n" op)
(define-values (basic-blocks entry-points) (fracture stmts)) (define-values (basic-blocks entry-points) (fracture stmts))
@ -241,7 +241,7 @@ EOF
(assemble-oparg (TestPrimitiveProcedure-operand test)))] (assemble-oparg (TestPrimitiveProcedure-operand test)))]
[(TestClosureArityMismatch? test) [(TestClosureArityMismatch? test)
(format "if(!RUNTIME.isArityMatching((~a).racketArity,~a))" (format "if(!RT.isArityMatching((~a).racketArity,~a))"
(assemble-oparg (TestClosureArityMismatch-closure test)) (assemble-oparg (TestClosureArityMismatch-closure test))
(assemble-oparg (TestClosureArityMismatch-n test)))])) (assemble-oparg (TestClosureArityMismatch-n test)))]))
(display test-code op) (display test-code op)
@ -440,7 +440,7 @@ EOF
(assemble-oparg (TestPrimitiveProcedure-operand test)) (assemble-oparg (TestPrimitiveProcedure-operand test))
jump)] jump)]
[(TestClosureArityMismatch? test) [(TestClosureArityMismatch? test)
(format "if(!RUNTIME.isArityMatching((~a).racketArity,~a)){~a}" (format "if(!RT.isArityMatching((~a).racketArity,~a)){~a}"
(assemble-oparg (TestClosureArityMismatch-closure test)) (assemble-oparg (TestClosureArityMismatch-closure test))
(assemble-oparg (TestClosureArityMismatch-n test)) (assemble-oparg (TestClosureArityMismatch-n test))
jump)]) jump)])
@ -450,10 +450,10 @@ EOF
(assemble-jump (GotoStatement-target stmt))] (assemble-jump (GotoStatement-target stmt))]
[(PushControlFrame/Generic? stmt) [(PushControlFrame/Generic? stmt)
"MACHINE.control.push(new RUNTIME.Frame());"] "MACHINE.control.push(new RT.Frame());"]
[(PushControlFrame/Call? stmt) [(PushControlFrame/Call? stmt)
(format "MACHINE.control.push(new RUNTIME.CallFrame(~a,MACHINE.proc));" (format "MACHINE.control.push(new RT.CallFrame(~a,MACHINE.proc));"
(let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Call-label stmt)]) (let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Call-label stmt)])
(cond (cond
[(symbol? label) [(symbol? label)
@ -463,7 +463,7 @@ EOF
[(PushControlFrame/Prompt? stmt) [(PushControlFrame/Prompt? stmt)
;; fixme: use a different frame structure ;; fixme: use a different frame structure
(format "MACHINE.control.push(new RUNTIME.PromptFrame(~a,~a));" (format "MACHINE.control.push(new RT.PromptFrame(~a,~a));"
(let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Prompt-label stmt)]) (let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Prompt-label stmt)])
(cond (cond
[(symbol? label) [(symbol? label)

4
tests/test-assemble.rkt
View File

@ -46,7 +46,7 @@
"(function() { " "(function() { "
runtime runtime
"var RUNTIME = plt.runtime;" "var RT = plt.runtime;"
"var MACHINE = new plt.runtime.Machine();\n" "var MACHINE = new plt.runtime.Machine();\n"
"return function(success, fail, params){" "return function(success, fail, params){"
@ -65,7 +65,7 @@
[inspector (cdr a-statement+inspector)]) [inspector (cdr a-statement+inspector)])
(display runtime op) (display runtime op)
"var RUNTIME = plt.runtime;" "var RT = plt.runtime;"
(display "var MACHINE = new plt.runtime.Machine();\n" op) (display "var MACHINE = new plt.runtime.Machine();\n" op)
(display "(function() { " op) (display "(function() { " op)
(display "var myInvoke = " op) (display "var myInvoke = " op)