diff --git a/compiler.rkt b/compiler.rkt index afba65f..95e2684 100644 --- a/compiler.rkt +++ b/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) diff --git a/assemble-expression.rkt b/js-assembler/assemble-expression.rkt similarity index 94% rename from assemble-expression.rkt rename to js-assembler/assemble-expression.rkt index ddba2b1..3e8ab57 100644 --- a/assemble-expression.rkt +++ b/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) diff --git a/assemble-helpers.rkt b/js-assembler/assemble-helpers.rkt similarity index 98% rename from assemble-helpers.rkt rename to js-assembler/assemble-helpers.rkt index a7a306d..499ab35 100644 --- a/assemble-helpers.rkt +++ b/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 diff --git a/assemble-open-coded.rkt b/js-assembler/assemble-open-coded.rkt similarity index 97% rename from assemble-open-coded.rkt rename to js-assembler/assemble-open-coded.rkt index 8bca19c..19c7a73 100644 --- a/assemble-open-coded.rkt +++ b/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) diff --git a/assemble-perform-statement.rkt b/js-assembler/assemble-perform-statement.rkt similarity index 98% rename from assemble-perform-statement.rkt rename to js-assembler/assemble-perform-statement.rkt index 2eb371b..5183d03 100644 --- a/assemble-perform-statement.rkt +++ b/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) diff --git a/assemble-structs.rkt b/js-assembler/assemble-structs.rkt similarity index 90% rename from assemble-structs.rkt rename to js-assembler/assemble-structs.rkt index dca760b..e026e64 100644 --- a/assemble-structs.rkt +++ b/js-assembler/assemble-structs.rkt @@ -3,7 +3,7 @@ (provide (all-defined-out)) -(require "il-structs.rkt") +(require "../il-structs.rkt") diff --git a/assemble.rkt b/js-assembler/assemble.rkt similarity index 98% rename from assemble.rkt rename to js-assembler/assemble.rkt index 8e331c9..b15f763 100644 --- a/assemble.rkt +++ b/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) diff --git a/collect-jump-targets.rkt b/js-assembler/collect-jump-targets.rkt similarity index 97% rename from collect-jump-targets.rkt rename to js-assembler/collect-jump-targets.rkt index 293002f..766ad44 100644 --- a/collect-jump-targets.rkt +++ b/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) diff --git a/package.rkt b/package.rkt index 50cdb25..f1c12dd 100644 --- a/package.rkt +++ b/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" diff --git a/test-assemble.rkt b/test-assemble.rkt index bc3b545..c4a8077 100644 --- a/test-assemble.rkt +++ b/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" diff --git a/test-compiler-2.rkt b/test-compiler-2.rkt index 15ee8f3..9f6c80c 100644 --- a/test-compiler-2.rkt +++ b/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") diff --git a/test-conform.rkt b/test-conform.rkt index ba55ee8..037e9fd 100644 --- a/test-conform.rkt +++ b/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" diff --git a/test-earley.rkt b/test-earley.rkt index 1796af9..cbc62cc 100644 --- a/test-earley.rkt +++ b/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") diff --git a/test-simulator.rkt b/test-simulator.rkt index 452a28d..25cc996 100644 --- a/test-simulator.rkt +++ b/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)