From a695eafa1563b6200733062cde3961b960b17d6c Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Mon, 23 May 2011 12:30:36 -0400 Subject: [PATCH] continuing to work on package --- NOTES | 23 ++++- bootstrapped-primitives.rkt | 15 ---- get-module-bytecode.rkt | 14 ++- js-assembler/assemble.rkt | 9 +- package.rkt | 153 ++++++++++++++++++++++---------- tests/module-test/m1.rkt | 2 + tests/module-test/m2.rkt | 3 + tests/test-browser-evaluate.rkt | 3 +- tests/test-conform-browser.rkt | 2 +- tests/test-earley-browser.rkt | 2 +- tests/test-package.rkt | 7 +- 11 files changed, 160 insertions(+), 73 deletions(-) create mode 100644 tests/module-test/m1.rkt create mode 100644 tests/module-test/m2.rkt diff --git a/NOTES b/NOTES index 19f82c8..4328227 100644 --- a/NOTES +++ b/NOTES @@ -539,4 +539,25 @@ May 20, 2011 I'm running my bytecode parser over the entire racket collects tree, just to make sure the parser itself is robust. -Parsing takes milliseconds, except on Typed Racket code, which is expected. \ No newline at end of file +Parsing takes milliseconds, except on Typed Racket code, which is expected. + + + +---------------------------------------------------------------------- + +May 23, 2011 + +Let me list out, roughly, what's left for me to do do: + + + Get module invokation working. + + Get enough of the racket/base helper functions working to get + basic programs in place. + + Get the runtime of Moby in the system. + + Integrate the raw JavaScript-specific extensions in. + + Isolate performance issues. + diff --git a/bootstrapped-primitives.rkt b/bootstrapped-primitives.rkt index 204432c..40df432 100644 --- a/bootstrapped-primitives.rkt +++ b/bootstrapped-primitives.rkt @@ -20,14 +20,6 @@ -;; We'll hardcode the compilation of some Racket modules here. -(: hardcoded-modules-to-compile (Listof Path)) -(define hardcoded-modules-to-compile - (list - (build-path collects-path "racket" "private" "modbeg.rkt") - )) - - ;; The primitive code necessary to do call/cc @@ -99,13 +91,6 @@ (append - ;; module code - (apply append (map (lambda: ([p : Path]) - (compile (parse-bytecode p) - 'val - next-linkage/drop-multiple)) - hardcoded-modules-to-compile)) - ;; Other primitives (make-bootstrapped-primitive-code diff --git a/get-module-bytecode.rkt b/get-module-bytecode.rkt index c894541..63dd81d 100644 --- a/get-module-bytecode.rkt +++ b/get-module-bytecode.rkt @@ -1,13 +1,21 @@ #lang racket/base (require racket/contract racket/path - syntax/modcode) + racket/runtime-path + syntax/modcode + "language-namespace.rkt") (provide/contract [get-module-bytecode ((or/c string? path? input-port?) . -> . bytes?)]) -(define base-namespace (make-base-namespace)) - +(define-runtime-path kernel-language-path + "lang/kernel.rkt") +(define base-namespace + (lookup-language-namespace + #;'racket/base + `(file ,(path->string kernel-language-path))) + #;(make-base-namespace)) + (define (get-module-bytecode x) (let ([compiled-code (cond diff --git a/js-assembler/assemble.rkt b/js-assembler/assemble.rkt index 5df061a..edc3d3d 100644 --- a/js-assembler/assemble.rkt +++ b/js-assembler/assemble.rkt @@ -25,17 +25,20 @@ (: assemble/write-invoke ((Listof Statement) Output-Port -> Void)) ;; Writes out the JavaScript code that represents the anonymous invocation expression. +;; What's emitted is a function expression that, when invoked, runs the +;; statements. (define (assemble/write-invoke stmts op) + (fprintf op "(function(MACHINE, success, fail, params) {\n") + (fprintf op "var param;\n") + (fprintf op "var RUNTIME = plt.runtime;\n") (let: ([basic-blocks : (Listof BasicBlock) (fracture stmts)]) - (fprintf op "(function(MACHINE, success, fail, params) {\n") - (fprintf op "var param;\n") - (fprintf op "var RUNTIME = plt.runtime;\n") (for-each (lambda: ([basic-block : BasicBlock]) (displayln (assemble-basic-block basic-block) op) (newline op)) basic-blocks) (write-linked-label-attributes stmts op) + (fprintf op "MACHINE.params.currentErrorHandler = fail;\n") (fprintf op "MACHINE.params.currentSuccessHandler = success;\n") (fprintf op #< void -(define (package source-code op) - (let ([source-code-op (open-output-bytes)]) - (write source-code source-code-op) - (let ([source-code-ip (open-input-bytes (get-output-bytes source-code-op))]) - (fprintf op "var invoke = ") - (assemble/write-invoke (append (get-bootstrapping-code) - (compile (parse-bytecode - (open-input-bytes (get-module-bytecode source-code-ip))) - 'val - next-linkage/drop-multiple)) - op) - (fprintf op ";\n")))) - - -(define (package-anonymous source-code op) +(define (package-anonymous source-code should-follow? op) (fprintf op "(function() {\n") - (package source-code op) + (package source-code should-follow? op) (fprintf op " return invoke; })\n")) +;; package: s-expression (path -> boolean) output-port -> void -(define (package-standalone-html a-module-path op) - ;; FIXME: write the runtime ... - ;; Next, write the function to load in each module. - (fprintf op #< - - - - Example - - - - - -EOF - )) \ No newline at end of file +;; (fprintf op #< +;; +;; +;; +;; EOF +;; )) \ No newline at end of file diff --git a/tests/module-test/m1.rkt b/tests/module-test/m1.rkt new file mode 100644 index 0000000..4012c8d --- /dev/null +++ b/tests/module-test/m1.rkt @@ -0,0 +1,2 @@ +(module m1 '#%kernel + (#%require "m2.rkt")) \ No newline at end of file diff --git a/tests/module-test/m2.rkt b/tests/module-test/m2.rkt new file mode 100644 index 0000000..aef84d0 --- /dev/null +++ b/tests/module-test/m2.rkt @@ -0,0 +1,3 @@ +(module m2 '#%kernel + (display "hello world") + (newline)) \ No newline at end of file diff --git a/tests/test-browser-evaluate.rkt b/tests/test-browser-evaluate.rkt index 3a8c7cc..f6eae64 100644 --- a/tests/test-browser-evaluate.rkt +++ b/tests/test-browser-evaluate.rkt @@ -5,6 +5,7 @@ +(define should-follow? (lambda (p) #t)) (define evaluate (make-evaluate (lambda (program op) @@ -17,7 +18,7 @@ (newline op) (fprintf op "var innerInvoke = ") - (package-anonymous program op) + (package-anonymous program should-follow? op) (fprintf op "();\n") (fprintf op #<