moved simulator and js-assembler into separate subdirectories

compiler.rkt

@@ -579,6 +579,7 @@
 
 
 (: compile-begin0 ((Listof Expression) CompileTimeEnvironment Target Linkage -> InstructionSequence))
+;; FIXME: this is broken at the moment.
 (define (compile-begin0 seq cenv target linkage)
   (cond
     [(empty? seq)

js-assembler/assemble-expression.rkt

@@ -1,10 +1,10 @@
 #lang typed/racket/base
 
-(require "il-structs.rkt"
-         "lexical-structs.rkt"
-	 "assemble-structs.rkt"
+(require "assemble-structs.rkt"
          "assemble-helpers.rkt"
          "assemble-open-coded.rkt"
+         "../il-structs.rkt"
+         "../lexical-structs.rkt"
          racket/string
          racket/list)
 

js-assembler/assemble-helpers.rkt

@@ -1,8 +1,8 @@
 #lang typed/racket/base
 
-(require "il-structs.rkt"
-         "expression-structs.rkt"
-         "lexical-structs.rkt"
+(require "../il-structs.rkt"
+         "../expression-structs.rkt"
+         "../lexical-structs.rkt"
          racket/list)
 
 (provide assemble-oparg

js-assembler/assemble-open-coded.rkt

@@ -1,9 +1,9 @@
 #lang typed/racket/base
 
-(require "il-structs.rkt"
-         "lexical-structs.rkt"
-         "assemble-helpers.rkt"
-         "kernel-primitives.rkt"
+(require "assemble-helpers.rkt"
+         "../il-structs.rkt"
+         "../lexical-structs.rkt"
+         "../kernel-primitives.rkt"
          racket/string
          racket/list)
 

js-assembler/assemble-perform-statement.rkt

@@ -1,7 +1,7 @@
 #lang typed/racket/base
-(require "il-structs.rkt"
-	 "assemble-helpers.rkt"
-	 "lexical-structs.rkt"
+(require "assemble-helpers.rkt"
+         "../il-structs.rkt"
+	 "../lexical-structs.rkt"
 	 racket/string)
 
 (provide assemble-op-statement)

js-assembler/assemble-structs.rkt

@@ -3,7 +3,7 @@
 (provide (all-defined-out))
 
 
-(require "il-structs.rkt")
+(require "../il-structs.rkt")
 
 
 

js-assembler/assemble.rkt

@@ -1,14 +1,14 @@
 #lang typed/racket/base
-(require "il-structs.rkt"
-         "lexical-structs.rkt"
-         "helpers.rkt"
-         "assemble-structs.rkt"
+(require "assemble-structs.rkt"
          "assemble-helpers.rkt"
          "assemble-open-coded.rkt"
          "assemble-expression.rkt"
          "assemble-perform-statement.rkt"
          "collect-jump-targets.rkt"
-         "expression-structs.rkt"
+         "../il-structs.rkt"
+         "../lexical-structs.rkt"
+         "../helpers.rkt"
+         "../expression-structs.rkt"
          racket/string
          racket/list)
 

js-assembler/collect-jump-targets.rkt

@@ -1,8 +1,8 @@
 #lang typed/racket/base
-(require "expression-structs.rkt"
-         "il-structs.rkt"
-	 "lexical-structs.rkt"
-	 "helpers.rkt"
+(require "../expression-structs.rkt"
+         "../il-structs.rkt"
+	 "../lexical-structs.rkt"
+	 "../helpers.rkt"
 	 racket/list)
 
 (provide collect-general-jump-targets)

package.rkt

@@ -2,7 +2,7 @@
 
 (require "compiler.rkt"
          "compiler-structs.rkt"
-         "assemble.rkt"
+         "js-assembler/assemble.rkt"
          "typed-parse.rkt"
          "il-structs.rkt"
          "bootstrapped-primitives.rkt"

test-assemble.rkt

@@ -1,6 +1,6 @@
 #lang racket
 
-(require "assemble.rkt"
+(require "js-assembler/assemble.rkt"
          "browser-evaluate.rkt"
          "lexical-structs.rkt"
          "il-structs.rkt"

test-compiler-2.rkt

@@ -1,8 +1,8 @@
 #lang racket
 
-(require "simulator.rkt"
-         "simulator-structs.rkt"
-         "simulator-helpers.rkt"
+(require "simulator/simulator.rkt"
+         "simulator/simulator-structs.rkt"
+         "simulator/simulator-helpers.rkt"
          "test-helpers.rkt")
 
 

test-conform.rkt

@@ -1,7 +1,7 @@
 #lang racket
 
-(require "simulator.rkt"
-         "simulator-structs.rkt"
+(require "simulator/simulator.rkt"
+         "simulator/simulator-structs.rkt"
          "compiler-structs.rkt"
          "compiler.rkt"
          "parse.rkt"

test-earley.rkt

@@ -1,7 +1,7 @@
 #lang racket
 
-(require "simulator.rkt"
-         "simulator-structs.rkt"
+(require "simulator/simulator.rkt"
+         "simulator/simulator-structs.rkt"
          "test-helpers.rkt")
 
 

test-simulator.rkt

@@ -2,9 +2,9 @@
 
 (require "il-structs.rkt"
          "lexical-structs.rkt"
-         "simulator-structs.rkt"
-         "simulator-primitives.rkt"
-         "simulator.rkt")
+         "simulator/simulator-structs.rkt"
+         "simulator/simulator-primitives.rkt"
+         "simulator/simulator.rkt")
 
 
 (define-syntax (test stx)