aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Martin <github@martintribe.org>2014-10-09 23:58:22 -0500
committerJoel Martin <github@martintribe.org>2015-01-06 21:57:24 -0600
commitf41866dbe99080f0916512261f0412c5bc65f190 (patch)
treefcd820850d978c54d22b3648d2228768a4ad0902
parent61a2c2a7042308cd4046b20d7f198ec7d3fedcbf (diff)
downloadmal-f41866dbe99080f0916512261f0412c5bc65f190.tar.gz
mal-f41866dbe99080f0916512261f0412c5bc65f190.zip
Doc cleanup of step9/stepA swap.
-rw-r--r--README.md4
-rw-r--r--docs/step_notes.txt26
-rw-r--r--java/pom.xml4
3 files changed, 17 insertions, 17 deletions
diff --git a/README.md b/README.md
index f6d756a..1156135 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@ The mal (make a lisp) steps are:
* step6_file
* step7_quote
* step8_macros
-* step9_interop
-* stepA_more
+* step9_try
+* stepA_interop
Mal was presented publicly for the first time in a lightning talk at
diff --git a/docs/step_notes.txt b/docs/step_notes.txt
index 44cf8f8..071baf7 100644
--- a/docs/step_notes.txt
+++ b/docs/step_notes.txt
@@ -335,13 +335,7 @@ Step Notes:
- add first, rest and nth to core.ns
- make test^go^step8 should now pass
-- step9_interop
- - convert returned data to mal data
- - recursive, similar to pr_str
- - Details:
- - can be done after stepA_more
-
-- stepA_more
+- stepA_try
- core module:
- throw function
- apply, map functions: should not directly call EVAL, which
@@ -354,7 +348,7 @@ Step Notes:
- set and print *host-language*
- define cond and or macros using REP/RE
- Details:
- - cp step8_macros.EXT to stepA_more.EXT
+ - cp step8_macros.EXT to stepA_try.EXT
- if compiled update Makefile
- core.ns implement nil?, true?, false?, symbol?, sequential?,
vector, vector?
@@ -376,8 +370,8 @@ Step Notes:
- may need to box HashMap and native functions
- add atom type, reader macro and functions: with_meta, meta
- get `make test^go^stepA` to fully pass
- - get `./stepA_more ../mal/step1_read_print` to pass
- - continue for each mal step until ../mal/stepA_more
+ - get `./stepA_try ../mal/step1_read_print` to pass
+ - continue for each mal step until ../mal/stepA_try
- Now self-hosting!
@@ -387,9 +381,6 @@ Step Notes:
- vector, vector?
-- Other misc:
- - conj function
-
- atoms
- reader module:
- @a reader macro -> (deref a)
@@ -406,3 +397,12 @@ Step Notes:
- clone/copy of collections
- core module:
- add with-meta, meta functions
+
+- Other misc:
+ - conj function
+
+- stepA_interop
+ - convert returned data to mal data
+ - recursive, similar to pr_str
+ - Details:
+
diff --git a/java/pom.xml b/java/pom.xml
index 2f0a4fd..ae53194 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -47,7 +47,7 @@
</executions>
<configuration>
<!--
- <mainClass>mal.stepA_more</mainClass>
+ <mainClass>mal.stepA_interop</mainClass>
<arguments>
<argument>foo</argument>
<argument>bar</argument>
@@ -69,7 +69,7 @@
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>mal.stepA_more</mainClass>
+ <mainClass>mal.stepA_interop</mainClass>
</transformer>
</transformers>
</configuration>