Common Lisp: Move source code to src/ folder

diff --git a/common-lisp/Makefile b/common-lisp/Makefile
index 9d62070..d6d8437 100644 (file)
--- a/common-lisp/Makefile
+++ b/common-lisp/Makefile
@@ -12,8 +12,8 @@ define steps
 endef
 
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-SOURCES_LISP := env.lisp core.lisp stepA_mal.lisp
-SOURCES := utils.lisp types.lisp reader.lisp printer.lisp $(SOURCES_LISP)
+SOURCES_LISP := src/env.lisp src/core.lisp src/stepA_mal.lisp
+SOURCES := src/utils.lisp src/types.lisp src/reader.lisp src/printer.lisp $(SOURCES_LISP)
 LISP ?= sbcl
 ABCL ?= abcl
 
@@ -33,7 +33,7 @@ hist/%_impl: ;
 # directory of the CL_LAUNCH_FILE in --wrap script so that the script can find the dumped
 # image even if invoked from some directory different from where it
 # currently resides
-step% : step%.lisp utils.lisp types.lisp env.lisp printer.lisp reader.lisp core.lisp hist/%_impl
+step% : src/step%.lisp src/utils.lisp src/types.lisp src/env.lisp src/printer.lisp src/reader.lisp src/core.lisp hist/%_impl
 ifeq ($(LISP),abcl)
        echo -n '#!/bin/sh\ncd `dirname $$0` ; $(ABCL) --noinform --noinit --nosystem --load run-abcl.lisp -- $@ $$@' > $@
        chmod +x $@

diff --git a/common-lisp/core.lisp b/common-lisp/src/core.lisp
similarity index 100%
rename from common-lisp/core.lisp
rename to common-lisp/src/core.lisp

diff --git a/common-lisp/env.lisp b/common-lisp/src/env.lisp
similarity index 100%
rename from common-lisp/env.lisp
rename to common-lisp/src/env.lisp

diff --git a/common-lisp/printer.lisp b/common-lisp/src/printer.lisp
similarity index 100%
rename from common-lisp/printer.lisp
rename to common-lisp/src/printer.lisp

diff --git a/common-lisp/reader.lisp b/common-lisp/src/reader.lisp
similarity index 100%
rename from common-lisp/reader.lisp
rename to common-lisp/src/reader.lisp

diff --git a/common-lisp/step0_repl.lisp b/common-lisp/src/step0_repl.lisp
similarity index 100%
rename from common-lisp/step0_repl.lisp
rename to common-lisp/src/step0_repl.lisp

diff --git a/common-lisp/step1_read_print.lisp b/common-lisp/src/step1_read_print.lisp
similarity index 100%
rename from common-lisp/step1_read_print.lisp
rename to common-lisp/src/step1_read_print.lisp

diff --git a/common-lisp/step2_eval.lisp b/common-lisp/src/step2_eval.lisp
similarity index 100%
rename from common-lisp/step2_eval.lisp
rename to common-lisp/src/step2_eval.lisp

diff --git a/common-lisp/step3_env.lisp b/common-lisp/src/step3_env.lisp
similarity index 100%
rename from common-lisp/step3_env.lisp
rename to common-lisp/src/step3_env.lisp

diff --git a/common-lisp/step4_if_fn_do.lisp b/common-lisp/src/step4_if_fn_do.lisp
similarity index 100%
rename from common-lisp/step4_if_fn_do.lisp
rename to common-lisp/src/step4_if_fn_do.lisp

diff --git a/common-lisp/step5_tco.lisp b/common-lisp/src/step5_tco.lisp
similarity index 100%
rename from common-lisp/step5_tco.lisp
rename to common-lisp/src/step5_tco.lisp

diff --git a/common-lisp/step6_file.lisp b/common-lisp/src/step6_file.lisp
similarity index 100%
rename from common-lisp/step6_file.lisp
rename to common-lisp/src/step6_file.lisp

diff --git a/common-lisp/step7_quote.lisp b/common-lisp/src/step7_quote.lisp
similarity index 100%
rename from common-lisp/step7_quote.lisp
rename to common-lisp/src/step7_quote.lisp

diff --git a/common-lisp/step8_macros.lisp b/common-lisp/src/step8_macros.lisp
similarity index 100%
rename from common-lisp/step8_macros.lisp
rename to common-lisp/src/step8_macros.lisp

diff --git a/common-lisp/step9_try.lisp b/common-lisp/src/step9_try.lisp
similarity index 100%
rename from common-lisp/step9_try.lisp
rename to common-lisp/src/step9_try.lisp

diff --git a/common-lisp/stepA_mal.lisp b/common-lisp/src/stepA_mal.lisp
similarity index 100%
rename from common-lisp/stepA_mal.lisp
rename to common-lisp/src/stepA_mal.lisp

diff --git a/common-lisp/types.lisp b/common-lisp/src/types.lisp
similarity index 100%
rename from common-lisp/types.lisp
rename to common-lisp/src/types.lisp

diff --git a/common-lisp/utils.lisp b/common-lisp/src/utils.lisp
similarity index 100%
rename from common-lisp/utils.lisp
rename to common-lisp/src/utils.lisp

diff --git a/common-lisp/step0_repl.asd b/common-lisp/step0_repl.asd
index aee96e8..fbad7d6 100644 (file)
--- a/common-lisp/step0_repl.asd
+++ b/common-lisp/step0_repl.asd
@@ -19,4 +19,5 @@
   :description "Implementation of step 0 of MAL in Common Lisp"
   :serial t
   :components ((:file "step0_repl"))
-  :depends-on (:uiop :cl-readline))
+  :depends-on (:uiop :cl-readline)
+  :pathname "src/")

diff --git a/common-lisp/step1_read_print.asd b/common-lisp/step1_read_print.asd
index 993b77d..ea7134f 100644 (file)
--- a/common-lisp/step1_read_print.asd
+++ b/common-lisp/step1_read_print.asd
@@ -25,4 +25,5 @@
                (:file "reader")
                (:file "printer")
                (:file "step1_read_print"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step2_eval.asd b/common-lisp/step2_eval.asd
index 2b0b3c5..06b1b80 100644 (file)
--- a/common-lisp/step2_eval.asd
+++ b/common-lisp/step2_eval.asd
@@ -26,4 +26,5 @@
                (:file "reader")
                (:file "printer")
                (:file "step2_eval"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step3_env.asd b/common-lisp/step3_env.asd
index 3dc014a..5120a3c 100644 (file)
--- a/common-lisp/step3_env.asd
+++ b/common-lisp/step3_env.asd
@@ -26,4 +26,5 @@
                (:file "reader")
                (:file "printer")
                (:file "step3_env"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step4_if_fn_do.asd b/common-lisp/step4_if_fn_do.asd
index efddd5e..902f99a 100644 (file)
--- a/common-lisp/step4_if_fn_do.asd
+++ b/common-lisp/step4_if_fn_do.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "step4_if_fn_do"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step5_tco.asd b/common-lisp/step5_tco.asd
index bdc4209..08ebfad 100644 (file)
--- a/common-lisp/step5_tco.asd
+++ b/common-lisp/step5_tco.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "step5_tco"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step6_file.asd b/common-lisp/step6_file.asd
index 35bc77f..f8937b2 100644 (file)
--- a/common-lisp/step6_file.asd
+++ b/common-lisp/step6_file.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "step6_file"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step7_quote.asd b/common-lisp/step7_quote.asd
index efa0269..73df642 100644 (file)
--- a/common-lisp/step7_quote.asd
+++ b/common-lisp/step7_quote.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "step7_quote"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step8_macros.asd b/common-lisp/step8_macros.asd
index 64d2f97..e0b4c41 100644 (file)
--- a/common-lisp/step8_macros.asd
+++ b/common-lisp/step8_macros.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "step8_macros"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/step9_try.asd b/common-lisp/step9_try.asd
index 84e0ef0..b1ea4a0 100644 (file)
--- a/common-lisp/step9_try.asd
+++ b/common-lisp/step9_try.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "step9_try"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")

diff --git a/common-lisp/stepA_mal.asd b/common-lisp/stepA_mal.asd
index 63efad1..b9aca81 100644 (file)
--- a/common-lisp/stepA_mal.asd
+++ b/common-lisp/stepA_mal.asd
@@ -27,4 +27,5 @@
                (:file "printer")
                (:file "core")
                (:file "stepA_mal"))
-  :depends-on (:uiop :cl-readline :cl-ppcre :genhash))
+  :depends-on (:uiop :cl-readline :cl-ppcre :genhash)
+  :pathname "src/")