diff --git a/whalesong/repl-prototype/htdocs/index.html b/whalesong/repl-prototype/htdocs/index.html
index bd1bdf2..f7735b8 100644
--- a/whalesong/repl-prototype/htdocs/index.html
+++ b/whalesong/repl-prototype/htdocs/index.html
@@ -2,7 +2,7 @@
-
+
diff --git a/whalesong/repl-prototype/htdocs/repl.js b/whalesong/repl-prototype/htdocs/repl.js
index 74f98bf..090f96b 100644
--- a/whalesong/repl-prototype/htdocs/repl.js
+++ b/whalesong/repl-prototype/htdocs/repl.js
@@ -19,7 +19,7 @@ $(document).ready(function() {
// We then want to initialize the language module.
var initializeLanguage = function(afterLanguageInitialization) {
// Load up the language.
- M.modules['whalesong/lang/whalesong.rkt'].invoke(
+ M.modules['whalesong/wescheme/lang/semantics.rkt'].invoke(
M,
function() {
console.log("Environment initialized.");
diff --git a/whalesong/repl-prototype/server.rkt b/whalesong/repl-prototype/server.rkt
index 0239512..0df4a70 100644
--- a/whalesong/repl-prototype/server.rkt
+++ b/whalesong/repl-prototype/server.rkt
@@ -26,6 +26,10 @@
(define-runtime-path htdocs (build-path "htdocs"))
+(define language 'whalesong/wescheme/lang/semantics)
+
+
+
;; make-port-response: (values response/incremental output-port)
;; Creates a response that's coupled to an output-port: whatever you
;; write into the output will be pushed into the response.
@@ -69,7 +73,7 @@
(cond [(eof-object? sexp)
'()]
[else
- (define raw-bytecode (repl-compile sexp #:lang 'whalesong/lang/whalesong))
+ (define raw-bytecode (repl-compile sexp #:lang language))
(define op (open-output-bytes))
(write raw-bytecode op)
(define whalesong-bytecode (parse-bytecode (open-input-bytes (get-output-bytes op))))
diff --git a/whalesong/repl-prototype/write-runtime.rkt b/whalesong/repl-prototype/write-runtime.rkt
index e6c9dbc..82aab26 100644
--- a/whalesong/repl-prototype/write-runtime.rkt
+++ b/whalesong/repl-prototype/write-runtime.rkt
@@ -11,7 +11,8 @@
(provide write-repl-runtime-files)
(define-runtime-path collects-path (build-path "htdocs" "collects"))
-(define-runtime-path whalesong-lang (build-path "../lang/whalesong.rkt"))
+(define-runtime-path language-path
+ (build-path "../wescheme/lang/semantics.rkt"))
@@ -50,10 +51,10 @@
(display (get-runtime) op))
#:exists 'replace)
- (call-with-output-file* (make-output-js-filename 'whalesong-lang)
+ (call-with-output-file* (make-output-js-filename 'library)
(lambda (op)
(display (get-inert-code (make-ModuleSource
- (normalize-path whalesong-lang))
+ (normalize-path language-path))
make-output-js-filename)
op))
#:exists 'replace)
diff --git a/whalesong/wescheme/lang/semantics.rkt b/whalesong/wescheme/lang/semantics.rkt
index f0fc224..b9b661f 100644
--- a/whalesong/wescheme/lang/semantics.rkt
+++ b/whalesong/wescheme/lang/semantics.rkt
@@ -1,7 +1,9 @@
#lang whalesong
(require whalesong/image
+ whalesong/world
whalesong/lang/whalesong)
(provide (all-from-out whalesong/lang/whalesong)
- (all-from-out whalesong/image))
+ (all-from-out whalesong/image)
+ (all-from-out whalesong/world))