From 2463cb90e6422e0cf6ab924fdee6d2569ce63343 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Fri, 13 May 2011 14:03:00 -0400
Subject: [PATCH] simulator in separate directory

---
 dead/README                                        |  1 +
 experiment.rkt => dead/experiment.rkt              |  0
 relooper.rkt => dead/relooper.rkt                  |  0
 sample-small-file-bytecode.rkt                     | 14 --------------
 sample-small-file.rkt                              |  9 ---------
 .../simulator-helpers.rkt                          |  0
 .../simulator-primitives.rkt                       |  2 +-
 .../simulator-structs.rkt                          |  6 +++---
 simulator.rkt => simulator/simulator.rkt           | 14 +++++++-------
 test-compiler.rkt                                  |  6 +++---
 10 files changed, 15 insertions(+), 37 deletions(-)
 create mode 100644 dead/README
 rename experiment.rkt => dead/experiment.rkt (100%)
 rename relooper.rkt => dead/relooper.rkt (100%)
 delete mode 100644 sample-small-file-bytecode.rkt
 delete mode 100644 sample-small-file.rkt
 rename simulator-helpers.rkt => simulator/simulator-helpers.rkt (100%)
 rename simulator-primitives.rkt => simulator/simulator-primitives.rkt (99%)
 rename simulator-structs.rkt => simulator/simulator-structs.rkt (98%)
 rename simulator.rkt => simulator/simulator.rkt (99%)

diff --git a/dead/README b/dead/README
new file mode 100644
index 0000000..f9e0dc8
--- /dev/null
+++ b/dead/README
@@ -0,0 +1 @@
+This holds file that may be dead code.
\ No newline at end of file
diff --git a/experiment.rkt b/dead/experiment.rkt
similarity index 100%
rename from experiment.rkt
rename to dead/experiment.rkt
diff --git a/relooper.rkt b/dead/relooper.rkt
similarity index 100%
rename from relooper.rkt
rename to dead/relooper.rkt
diff --git a/sample-small-file-bytecode.rkt b/sample-small-file-bytecode.rkt
deleted file mode 100644
index 9151757..0000000
--- a/sample-small-file-bytecode.rkt
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket
-(require compiler/zo-parse)
-(require (for-syntax racket/base))
-
-(provide bytecode)
-
-
-(define bytecode
-  (parameterize ([current-namespace (make-base-namespace)])
-  (let ([bc (compile (parameterize ([read-accept-reader #t])
-                       (read (open-input-file "/home/dyoo/work/js-sicp-5-5/sample-small-file.rkt"))))]
-        [op (open-output-bytes)])
-    (write bc op)
-    (zo-parse (open-input-bytes (get-output-bytes op))))))
\ No newline at end of file
diff --git a/sample-small-file.rkt b/sample-small-file.rkt
deleted file mode 100644
index 2c3dc91..0000000
--- a/sample-small-file.rkt
+++ /dev/null
@@ -1,9 +0,0 @@
-#lang racket/base
-(provide f)
-(define (f x)
-  (* x x))
-
-
-;; infinite loop
-(letrec ([g (lambda () (g))])
-  (g))
diff --git a/simulator-helpers.rkt b/simulator/simulator-helpers.rkt
similarity index 100%
rename from simulator-helpers.rkt
rename to simulator/simulator-helpers.rkt
diff --git a/simulator-primitives.rkt b/simulator/simulator-primitives.rkt
similarity index 99%
rename from simulator-primitives.rkt
rename to simulator/simulator-primitives.rkt
index afa5269..c94de83 100644
--- a/simulator-primitives.rkt
+++ b/simulator/simulator-primitives.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require "simulator-structs.rkt"
-         "il-structs.rkt"
+         "../il-structs.rkt"
          racket/math
          racket/list
          (for-syntax racket/base))
diff --git a/simulator-structs.rkt b/simulator/simulator-structs.rkt
similarity index 98%
rename from simulator-structs.rkt
rename to simulator/simulator-structs.rkt
index 2352df6..e9cd0b7 100644
--- a/simulator-structs.rkt
+++ b/simulator/simulator-structs.rkt
@@ -2,9 +2,9 @@
 
 (provide (all-defined-out))
 
-(require "il-structs.rkt"
-         "expression-structs.rkt"
-         "lexical-structs.rkt")
+(require "../il-structs.rkt"
+         "../expression-structs.rkt"
+         "../lexical-structs.rkt")
 
 
 (define-type PrimitiveValue (Rec PrimitiveValue (U String Number Symbol Boolean
diff --git a/simulator.rkt b/simulator/simulator.rkt
similarity index 99%
rename from simulator.rkt
rename to simulator/simulator.rkt
index 8b4dc17..0913686 100644
--- a/simulator.rkt
+++ b/simulator/simulator.rkt
@@ -5,13 +5,13 @@
 ;; For example, I'll need to be able to count the number of statements executed by an evaluation.
 ;; I also need to do things like count pushes and pops.  Basically, low-level benchmarking.
 
-(require "expression-structs.rkt"
-         "il-structs.rkt"
-         "lexical-structs.rkt"
-         "simulator-structs.rkt"
-         "bootstrapped-primitives.rkt"
-         "kernel-primitives.rkt"
-         "expression-structs.rkt"
+(require "simulator-structs.rkt"
+         "../expression-structs.rkt"
+         "../il-structs.rkt"
+         "../lexical-structs.rkt"
+         "../bootstrapped-primitives.rkt"
+         "../kernel-primitives.rkt"
+         "../expression-structs.rkt"
          racket/list
          racket/match
          (for-syntax racket/base))
diff --git a/test-compiler.rkt b/test-compiler.rkt
index 85e2893..96fd418 100644
--- a/test-compiler.rkt
+++ b/test-compiler.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")