From 8f7a0d9e45cc6ad136bd1eb1f11d05dc02a84120 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 11:50:07 +0900 Subject: [PATCH 1/7] update benz --- extlib/benz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extlib/benz b/extlib/benz index 0c67a4b7..1d7669a5 160000 --- a/extlib/benz +++ b/extlib/benz @@ -1 +1 @@ -Subproject commit 0c67a4b77fcc317a78af4bd40afca591f25a09cb +Subproject commit 1d7669a5d4a1ece8d73268166917677e99671136 From 42a8fe555f07d034566fed3e3443848e261a27d8 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 11:54:53 +0900 Subject: [PATCH 2/7] move srfis to contrib/ --- {piclib/srfi => contrib/10.srfi}/1.scm | 0 {piclib/srfi => contrib/10.srfi}/111.scm | 0 {piclib/srfi => contrib/10.srfi}/17.scm | 0 {piclib/srfi => contrib/10.srfi}/26.scm | 0 {piclib/srfi => contrib/10.srfi}/43.scm | 0 {piclib/srfi => contrib/10.srfi}/60.scm | 0 {piclib/srfi => contrib/10.srfi}/8.scm | 0 {piclib/srfi => contrib/10.srfi}/95.scm | 0 contrib/10.srfi/CMakeLists.txt | 10 ++++++++++ piclib/CMakeLists.txt | 9 --------- 10 files changed, 10 insertions(+), 9 deletions(-) rename {piclib/srfi => contrib/10.srfi}/1.scm (100%) rename {piclib/srfi => contrib/10.srfi}/111.scm (100%) rename {piclib/srfi => contrib/10.srfi}/17.scm (100%) rename {piclib/srfi => contrib/10.srfi}/26.scm (100%) rename {piclib/srfi => contrib/10.srfi}/43.scm (100%) rename {piclib/srfi => contrib/10.srfi}/60.scm (100%) rename {piclib/srfi => contrib/10.srfi}/8.scm (100%) rename {piclib/srfi => contrib/10.srfi}/95.scm (100%) create mode 100644 contrib/10.srfi/CMakeLists.txt diff --git a/piclib/srfi/1.scm b/contrib/10.srfi/1.scm similarity index 100% rename from piclib/srfi/1.scm rename to contrib/10.srfi/1.scm diff --git a/piclib/srfi/111.scm b/contrib/10.srfi/111.scm similarity index 100% rename from piclib/srfi/111.scm rename to contrib/10.srfi/111.scm diff --git a/piclib/srfi/17.scm b/contrib/10.srfi/17.scm similarity index 100% rename from piclib/srfi/17.scm rename to contrib/10.srfi/17.scm diff --git a/piclib/srfi/26.scm b/contrib/10.srfi/26.scm similarity index 100% rename from piclib/srfi/26.scm rename to contrib/10.srfi/26.scm diff --git a/piclib/srfi/43.scm b/contrib/10.srfi/43.scm similarity index 100% rename from piclib/srfi/43.scm rename to contrib/10.srfi/43.scm diff --git a/piclib/srfi/60.scm b/contrib/10.srfi/60.scm similarity index 100% rename from piclib/srfi/60.scm rename to contrib/10.srfi/60.scm diff --git a/piclib/srfi/8.scm b/contrib/10.srfi/8.scm similarity index 100% rename from piclib/srfi/8.scm rename to contrib/10.srfi/8.scm diff --git a/piclib/srfi/95.scm b/contrib/10.srfi/95.scm similarity index 100% rename from piclib/srfi/95.scm rename to contrib/10.srfi/95.scm diff --git a/contrib/10.srfi/CMakeLists.txt b/contrib/10.srfi/CMakeLists.txt new file mode 100644 index 00000000..17ffce18 --- /dev/null +++ b/contrib/10.srfi/CMakeLists.txt @@ -0,0 +1,10 @@ +list(APPEND PICLIB_CONTRIB_LIBS + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/1.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/8.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/17.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/26.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/43.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/60.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/95.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/111.scm + ) diff --git a/piclib/CMakeLists.txt b/piclib/CMakeLists.txt index c31da069..12df168c 100644 --- a/piclib/CMakeLists.txt +++ b/piclib/CMakeLists.txt @@ -22,14 +22,5 @@ list(APPEND PICLIB_SCHEME_LIBS ${PROJECT_SOURCE_DIR}/piclib/scheme/time.scm ${PROJECT_SOURCE_DIR}/piclib/scheme/r5rs.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/1.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/8.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/17.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/26.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/43.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/60.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/95.scm - ${PROJECT_SOURCE_DIR}/piclib/srfi/111.scm - ${PROJECT_SOURCE_DIR}/piclib/picrin/user.scm ) From 260f993d87c42e72c4d25b171b701e181a1b5517 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 12:08:36 +0900 Subject: [PATCH 3/7] mkdir srfi --- contrib/10.srfi/CMakeLists.txt | 16 ++++++++-------- contrib/10.srfi/{ => srfi}/1.scm | 0 contrib/10.srfi/{ => srfi}/111.scm | 0 contrib/10.srfi/{ => srfi}/17.scm | 0 contrib/10.srfi/{ => srfi}/26.scm | 0 contrib/10.srfi/{ => srfi}/43.scm | 0 contrib/10.srfi/{ => srfi}/60.scm | 0 contrib/10.srfi/{ => srfi}/8.scm | 0 contrib/10.srfi/{ => srfi}/95.scm | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename contrib/10.srfi/{ => srfi}/1.scm (100%) rename contrib/10.srfi/{ => srfi}/111.scm (100%) rename contrib/10.srfi/{ => srfi}/17.scm (100%) rename contrib/10.srfi/{ => srfi}/26.scm (100%) rename contrib/10.srfi/{ => srfi}/43.scm (100%) rename contrib/10.srfi/{ => srfi}/60.scm (100%) rename contrib/10.srfi/{ => srfi}/8.scm (100%) rename contrib/10.srfi/{ => srfi}/95.scm (100%) diff --git a/contrib/10.srfi/CMakeLists.txt b/contrib/10.srfi/CMakeLists.txt index 17ffce18..1cabb620 100644 --- a/contrib/10.srfi/CMakeLists.txt +++ b/contrib/10.srfi/CMakeLists.txt @@ -1,10 +1,10 @@ list(APPEND PICLIB_CONTRIB_LIBS - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/1.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/8.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/17.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/26.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/43.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/60.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/95.scm - ${PROJECT_SOURCE_DIR}/contrib/10.srfi/111.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/1.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/8.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/17.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/26.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/43.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/60.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/95.scm + ${PROJECT_SOURCE_DIR}/contrib/10.srfi/srfi/111.scm ) diff --git a/contrib/10.srfi/1.scm b/contrib/10.srfi/srfi/1.scm similarity index 100% rename from contrib/10.srfi/1.scm rename to contrib/10.srfi/srfi/1.scm diff --git a/contrib/10.srfi/111.scm b/contrib/10.srfi/srfi/111.scm similarity index 100% rename from contrib/10.srfi/111.scm rename to contrib/10.srfi/srfi/111.scm diff --git a/contrib/10.srfi/17.scm b/contrib/10.srfi/srfi/17.scm similarity index 100% rename from contrib/10.srfi/17.scm rename to contrib/10.srfi/srfi/17.scm diff --git a/contrib/10.srfi/26.scm b/contrib/10.srfi/srfi/26.scm similarity index 100% rename from contrib/10.srfi/26.scm rename to contrib/10.srfi/srfi/26.scm diff --git a/contrib/10.srfi/43.scm b/contrib/10.srfi/srfi/43.scm similarity index 100% rename from contrib/10.srfi/43.scm rename to contrib/10.srfi/srfi/43.scm diff --git a/contrib/10.srfi/60.scm b/contrib/10.srfi/srfi/60.scm similarity index 100% rename from contrib/10.srfi/60.scm rename to contrib/10.srfi/srfi/60.scm diff --git a/contrib/10.srfi/8.scm b/contrib/10.srfi/srfi/8.scm similarity index 100% rename from contrib/10.srfi/8.scm rename to contrib/10.srfi/srfi/8.scm diff --git a/contrib/10.srfi/95.scm b/contrib/10.srfi/srfi/95.scm similarity index 100% rename from contrib/10.srfi/95.scm rename to contrib/10.srfi/srfi/95.scm From b54818b5d95b70d1c86ac4b8cf125e6de2175987 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 12:21:22 +0900 Subject: [PATCH 4/7] spill out r7rs nitro --- contrib/05.scheme/CMakeLists.txt | 15 +++++++++++++++ {piclib => contrib/05.scheme}/scheme/base.scm | 0 .../05.scheme}/scheme/case-lambda.scm | 0 {piclib => contrib/05.scheme}/scheme/cxr.scm | 0 {piclib => contrib/05.scheme}/scheme/eval.scm | 0 {piclib => contrib/05.scheme}/scheme/file.scm | 0 {piclib => contrib/05.scheme}/scheme/inexact.scm | 0 {piclib => contrib/05.scheme}/scheme/lazy.scm | 0 {piclib => contrib/05.scheme}/scheme/load.scm | 0 .../05.scheme}/scheme/process-context.scm | 0 {piclib => contrib/05.scheme}/scheme/r5rs.scm | 0 {piclib => contrib/05.scheme}/scheme/read.scm | 0 {piclib => contrib/05.scheme}/scheme/time.scm | 0 {piclib => contrib/05.scheme}/scheme/write.scm | 0 piclib/CMakeLists.txt | 14 -------------- 15 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 contrib/05.scheme/CMakeLists.txt rename {piclib => contrib/05.scheme}/scheme/base.scm (100%) rename {piclib => contrib/05.scheme}/scheme/case-lambda.scm (100%) rename {piclib => contrib/05.scheme}/scheme/cxr.scm (100%) rename {piclib => contrib/05.scheme}/scheme/eval.scm (100%) rename {piclib => contrib/05.scheme}/scheme/file.scm (100%) rename {piclib => contrib/05.scheme}/scheme/inexact.scm (100%) rename {piclib => contrib/05.scheme}/scheme/lazy.scm (100%) rename {piclib => contrib/05.scheme}/scheme/load.scm (100%) rename {piclib => contrib/05.scheme}/scheme/process-context.scm (100%) rename {piclib => contrib/05.scheme}/scheme/r5rs.scm (100%) rename {piclib => contrib/05.scheme}/scheme/read.scm (100%) rename {piclib => contrib/05.scheme}/scheme/time.scm (100%) rename {piclib => contrib/05.scheme}/scheme/write.scm (100%) diff --git a/contrib/05.scheme/CMakeLists.txt b/contrib/05.scheme/CMakeLists.txt new file mode 100644 index 00000000..16575ae9 --- /dev/null +++ b/contrib/05.scheme/CMakeLists.txt @@ -0,0 +1,15 @@ +list(APPEND PICLIB_SCHEME_LIBS + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/base.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/cxr.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/read.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/write.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/file.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/case-lambda.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/lazy.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/eval.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/inexact.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/load.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/process-context.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/time.scm + ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/r5rs.scm + ) diff --git a/piclib/scheme/base.scm b/contrib/05.scheme/scheme/base.scm similarity index 100% rename from piclib/scheme/base.scm rename to contrib/05.scheme/scheme/base.scm diff --git a/piclib/scheme/case-lambda.scm b/contrib/05.scheme/scheme/case-lambda.scm similarity index 100% rename from piclib/scheme/case-lambda.scm rename to contrib/05.scheme/scheme/case-lambda.scm diff --git a/piclib/scheme/cxr.scm b/contrib/05.scheme/scheme/cxr.scm similarity index 100% rename from piclib/scheme/cxr.scm rename to contrib/05.scheme/scheme/cxr.scm diff --git a/piclib/scheme/eval.scm b/contrib/05.scheme/scheme/eval.scm similarity index 100% rename from piclib/scheme/eval.scm rename to contrib/05.scheme/scheme/eval.scm diff --git a/piclib/scheme/file.scm b/contrib/05.scheme/scheme/file.scm similarity index 100% rename from piclib/scheme/file.scm rename to contrib/05.scheme/scheme/file.scm diff --git a/piclib/scheme/inexact.scm b/contrib/05.scheme/scheme/inexact.scm similarity index 100% rename from piclib/scheme/inexact.scm rename to contrib/05.scheme/scheme/inexact.scm diff --git a/piclib/scheme/lazy.scm b/contrib/05.scheme/scheme/lazy.scm similarity index 100% rename from piclib/scheme/lazy.scm rename to contrib/05.scheme/scheme/lazy.scm diff --git a/piclib/scheme/load.scm b/contrib/05.scheme/scheme/load.scm similarity index 100% rename from piclib/scheme/load.scm rename to contrib/05.scheme/scheme/load.scm diff --git a/piclib/scheme/process-context.scm b/contrib/05.scheme/scheme/process-context.scm similarity index 100% rename from piclib/scheme/process-context.scm rename to contrib/05.scheme/scheme/process-context.scm diff --git a/piclib/scheme/r5rs.scm b/contrib/05.scheme/scheme/r5rs.scm similarity index 100% rename from piclib/scheme/r5rs.scm rename to contrib/05.scheme/scheme/r5rs.scm diff --git a/piclib/scheme/read.scm b/contrib/05.scheme/scheme/read.scm similarity index 100% rename from piclib/scheme/read.scm rename to contrib/05.scheme/scheme/read.scm diff --git a/piclib/scheme/time.scm b/contrib/05.scheme/scheme/time.scm similarity index 100% rename from piclib/scheme/time.scm rename to contrib/05.scheme/scheme/time.scm diff --git a/piclib/scheme/write.scm b/contrib/05.scheme/scheme/write.scm similarity index 100% rename from piclib/scheme/write.scm rename to contrib/05.scheme/scheme/write.scm diff --git a/piclib/CMakeLists.txt b/piclib/CMakeLists.txt index 12df168c..cca3236a 100644 --- a/piclib/CMakeLists.txt +++ b/piclib/CMakeLists.txt @@ -8,19 +8,5 @@ list(APPEND PICLIB_SCHEME_LIBS ${PROJECT_SOURCE_DIR}/piclib/picrin/syntax-rules.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/test.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/base.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/cxr.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/read.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/write.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/file.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/case-lambda.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/lazy.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/eval.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/inexact.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/load.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/process-context.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/time.scm - ${PROJECT_SOURCE_DIR}/piclib/scheme/r5rs.scm - ${PROJECT_SOURCE_DIR}/piclib/picrin/user.scm ) From 527217e94a6c726ec4c35169a28b31fa375aab96 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 12:22:43 +0900 Subject: [PATCH 5/7] s/scheme/r7rs/g --- contrib/05.r7rs/CMakeLists.txt | 15 +++++++++++++++ contrib/{05.scheme => 05.r7rs}/scheme/base.scm | 0 .../{05.scheme => 05.r7rs}/scheme/case-lambda.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/cxr.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/eval.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/file.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/inexact.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/lazy.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/load.scm | 0 .../scheme/process-context.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/r5rs.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/read.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/time.scm | 0 contrib/{05.scheme => 05.r7rs}/scheme/write.scm | 0 contrib/05.scheme/CMakeLists.txt | 15 --------------- 15 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 contrib/05.r7rs/CMakeLists.txt rename contrib/{05.scheme => 05.r7rs}/scheme/base.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/case-lambda.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/cxr.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/eval.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/file.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/inexact.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/lazy.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/load.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/process-context.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/r5rs.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/read.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/time.scm (100%) rename contrib/{05.scheme => 05.r7rs}/scheme/write.scm (100%) delete mode 100644 contrib/05.scheme/CMakeLists.txt diff --git a/contrib/05.r7rs/CMakeLists.txt b/contrib/05.r7rs/CMakeLists.txt new file mode 100644 index 00000000..814d80c2 --- /dev/null +++ b/contrib/05.r7rs/CMakeLists.txt @@ -0,0 +1,15 @@ +list(APPEND PICLIB_SCHEME_LIBS + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/base.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/cxr.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/read.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/write.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/file.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/case-lambda.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/lazy.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/eval.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/inexact.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/load.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/process-context.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/time.scm + ${PROJECT_SOURCE_DIR}/contrib/05.r7rs/scheme/r5rs.scm + ) diff --git a/contrib/05.scheme/scheme/base.scm b/contrib/05.r7rs/scheme/base.scm similarity index 100% rename from contrib/05.scheme/scheme/base.scm rename to contrib/05.r7rs/scheme/base.scm diff --git a/contrib/05.scheme/scheme/case-lambda.scm b/contrib/05.r7rs/scheme/case-lambda.scm similarity index 100% rename from contrib/05.scheme/scheme/case-lambda.scm rename to contrib/05.r7rs/scheme/case-lambda.scm diff --git a/contrib/05.scheme/scheme/cxr.scm b/contrib/05.r7rs/scheme/cxr.scm similarity index 100% rename from contrib/05.scheme/scheme/cxr.scm rename to contrib/05.r7rs/scheme/cxr.scm diff --git a/contrib/05.scheme/scheme/eval.scm b/contrib/05.r7rs/scheme/eval.scm similarity index 100% rename from contrib/05.scheme/scheme/eval.scm rename to contrib/05.r7rs/scheme/eval.scm diff --git a/contrib/05.scheme/scheme/file.scm b/contrib/05.r7rs/scheme/file.scm similarity index 100% rename from contrib/05.scheme/scheme/file.scm rename to contrib/05.r7rs/scheme/file.scm diff --git a/contrib/05.scheme/scheme/inexact.scm b/contrib/05.r7rs/scheme/inexact.scm similarity index 100% rename from contrib/05.scheme/scheme/inexact.scm rename to contrib/05.r7rs/scheme/inexact.scm diff --git a/contrib/05.scheme/scheme/lazy.scm b/contrib/05.r7rs/scheme/lazy.scm similarity index 100% rename from contrib/05.scheme/scheme/lazy.scm rename to contrib/05.r7rs/scheme/lazy.scm diff --git a/contrib/05.scheme/scheme/load.scm b/contrib/05.r7rs/scheme/load.scm similarity index 100% rename from contrib/05.scheme/scheme/load.scm rename to contrib/05.r7rs/scheme/load.scm diff --git a/contrib/05.scheme/scheme/process-context.scm b/contrib/05.r7rs/scheme/process-context.scm similarity index 100% rename from contrib/05.scheme/scheme/process-context.scm rename to contrib/05.r7rs/scheme/process-context.scm diff --git a/contrib/05.scheme/scheme/r5rs.scm b/contrib/05.r7rs/scheme/r5rs.scm similarity index 100% rename from contrib/05.scheme/scheme/r5rs.scm rename to contrib/05.r7rs/scheme/r5rs.scm diff --git a/contrib/05.scheme/scheme/read.scm b/contrib/05.r7rs/scheme/read.scm similarity index 100% rename from contrib/05.scheme/scheme/read.scm rename to contrib/05.r7rs/scheme/read.scm diff --git a/contrib/05.scheme/scheme/time.scm b/contrib/05.r7rs/scheme/time.scm similarity index 100% rename from contrib/05.scheme/scheme/time.scm rename to contrib/05.r7rs/scheme/time.scm diff --git a/contrib/05.scheme/scheme/write.scm b/contrib/05.r7rs/scheme/write.scm similarity index 100% rename from contrib/05.scheme/scheme/write.scm rename to contrib/05.r7rs/scheme/write.scm diff --git a/contrib/05.scheme/CMakeLists.txt b/contrib/05.scheme/CMakeLists.txt deleted file mode 100644 index 16575ae9..00000000 --- a/contrib/05.scheme/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -list(APPEND PICLIB_SCHEME_LIBS - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/base.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/cxr.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/read.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/write.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/file.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/case-lambda.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/lazy.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/eval.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/inexact.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/load.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/process-context.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/time.scm - ${PROJECT_SOURCE_DIR}/contrib/05.scheme/scheme/r5rs.scm - ) From 912d1237bc4be1b20c116727b064bf4b8d6ddf58 Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 12:23:52 +0900 Subject: [PATCH 6/7] resolve interreference between (picrin user) and (scheme *) --- contrib/20.repl/repl.scm | 17 +++++++++++++++++ piclib/CMakeLists.txt | 2 -- piclib/picrin/user.scm | 17 ----------------- 3 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 piclib/picrin/user.scm diff --git a/contrib/20.repl/repl.scm b/contrib/20.repl/repl.scm index d839a7a7..2b9d4812 100644 --- a/contrib/20.repl/repl.scm +++ b/contrib/20.repl/repl.scm @@ -16,6 +16,23 @@ (define (add-history str) #f)))) + (eval + '(import (scheme base) + (scheme load) + (scheme process-context) + (scheme read) + (scheme write) + (scheme file) + (scheme inexact) + (scheme cxr) + (scheme lazy) + (scheme time) + (picrin macro) + (picrin dictionary) + (picrin array) + (picrin library)) + '(picrin user)) + (define (repl) (let loop ((buf "")) (let ((line (readline (if (equal? buf "") "> " "* ")))) diff --git a/piclib/CMakeLists.txt b/piclib/CMakeLists.txt index cca3236a..8da8ce80 100644 --- a/piclib/CMakeLists.txt +++ b/piclib/CMakeLists.txt @@ -7,6 +7,4 @@ list(APPEND PICLIB_SCHEME_LIBS ${PROJECT_SOURCE_DIR}/piclib/picrin/experimental/lambda.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/syntax-rules.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/test.scm - - ${PROJECT_SOURCE_DIR}/piclib/picrin/user.scm ) diff --git a/piclib/picrin/user.scm b/piclib/picrin/user.scm deleted file mode 100644 index fd1190ff..00000000 --- a/piclib/picrin/user.scm +++ /dev/null @@ -1,17 +0,0 @@ -; the default repl environment - -(define-library (picrin user) - (import (scheme base) - (scheme load) - (scheme process-context) - (scheme read) - (scheme write) - (scheme file) - (scheme inexact) - (scheme cxr) - (scheme lazy) - (scheme time) - (picrin macro) - (picrin dictionary) - (picrin array) - (picrin library))) From d90d91e45474ea9173b1cc3dac31ed05a00aca2e Mon Sep 17 00:00:00 2001 From: Yuichi Nishiwaki Date: Sat, 20 Sep 2014 12:29:16 +0900 Subject: [PATCH 7/7] fix library precedence --- piclib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piclib/CMakeLists.txt b/piclib/CMakeLists.txt index 8da8ce80..5e734f4a 100644 --- a/piclib/CMakeLists.txt +++ b/piclib/CMakeLists.txt @@ -1,6 +1,6 @@ list(APPEND PICLIB_SCHEME_LIBS - ${PROJECT_SOURCE_DIR}/piclib/picrin/macro.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/base.scm + ${PROJECT_SOURCE_DIR}/piclib/picrin/macro.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/record.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/array.scm ${PROJECT_SOURCE_DIR}/piclib/picrin/dictionary.scm