fixing the base (untraced) language

base/lang/reader.rkt

@@ -6,4 +6,4 @@
 	    `(file ,(path->string base-lang-path)))
 
 (require racket/runtime-path)
-(define-runtime-path base-lang-path "../lang/base.rkt")
+(define-runtime-path base-lang-path "../../lang/base.rkt")

js-assembler/assemble-perform-statement.rkt

@@ -140,7 +140,7 @@ EOF
              (assemble-oparg (UnspliceRestFromStack!-length op)))]
 
     [(InstallContinuationMarkEntry!? op)
-     (string-append "RUNTIME.installContinuationMarkEntry(MACHINE,"
+     (string-append "MACHINE.installContinuationMarkEntry("
                     "MACHINE.control[MACHINE.control.length-1].pendingContinuationMarkKey,"
                     "MACHINE.val);")]
 

js-assembler/runtime-src/runtime.js

@@ -341,6 +341,20 @@
     };
 
 
+    // Save the continuation mark on the top control frame.
+    Machine.prototype.installContinuationMarkEntry = function(key, value) {
+        var frame = this.control[this.control.length - 1];
+        var marks = frame.marks;
+        var i;
+        for (i = 0; i < marks.length; i++) {
+            if (equals(key, marks[i][0])) {
+                marks[i][1] = value;
+                return;
+            }
+        }
+        marks.push([key, value]);
+    };
+
     
 
 

lang/whalesong.rkt

@@ -7,7 +7,5 @@
 ;; If you don't want this, write in whalesong/base instead.
 
 (provide (except-out (all-from-out "base.rkt")
-                     ;;#%app
+                     #%app)
-                     )
+         (rename-out [traced-app #%app]))
-         ;;(rename-out [traced-app #%app])
-         )

tests/more-tests/booleans.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 (boolean? "t")
 (boolean? #t)

tests/more-tests/colors.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 (require (planet dyoo/whalesong/image))
 (color 3 4 5 0)

tests/more-tests/conform.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 (let ()
 
 ;; (define (caar l)

tests/more-tests/earley.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 (begin
    (define make-parser
      (lambda (grammar lexer)

tests/more-tests/hello.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 (displayln "hello world")
 
 

tests/more-tests/images.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 (require (planet dyoo/whalesong/image))
 
 (image-color? "red")

tests/more-tests/lists.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 '(1 2 3)
 (list "hello" "world")

tests/more-tests/man-vs-boy.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 ;; Knuth's Man-or-boy-test.
 ;; http://rosettacode.org/wiki/Man_or_boy_test

tests/more-tests/numbers.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 
 (number? 0)

tests/more-tests/simple-apply.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 (apply + 2 3 4 5 '())
 (apply + 2 3 4 '(5))

tests/more-tests/simple-functions.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 (provide (all-defined-out))
 

tests/more-tests/simple-structs.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 (define-struct pair (f r))
 (define-struct color (r g b))

tests/more-tests/sk-generator-2.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 (define (make-gen gen)
  (let ([cont (box #f)])
    (lambda ()

tests/more-tests/sk-generator.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 (define (make-gen gen)
  (let ([cont #f])
    (lambda ()

tests/more-tests/string-tests.rkt

@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang planet dyoo/whalesong/base
 
 (substring "hello world" 0)
 (substring "hello world" 1)