All: rename stepA_interop to stepA_mal

Also, add missed postscript interop tests.

74 files changed, 75 insertions, 53 deletions

diff --git a/.gitignore b/.gitignore
index 07d7921..2b05376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ c/*.o
 */step7_quote
 */step8_macros
 */step9_try
-*/stepA_interop
+*/stepA_mal
 cs/*.exe
 cs/*.dll
 cs/*.mdb
diff --git a/Makefile b/Makefile
index e30a6f6..674ad71 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ step6 = step6_file
 step7 = step7_quote
 step8 = step8_macros
 step9 = step9_try
-stepA = stepA_interop
+stepA = stepA_mal
 
 EXCLUDE_TESTS += test^bash^step5 # no stack exhaustion or completion
 EXCLUDE_TESTS += test^c^step5    # segfault
diff --git a/README.md b/README.md
index 612743c..94fdc2b 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ The mal (make a lisp) steps are:
 * [step7_quote](process/guide.md#step7)
 * [step8_macros](process/guide.md#step8)
 * [step9_try](process/guide.md#step9)
-* [stepA_interop](process/guide.md#stepA)
+* [stepA_mal](process/guide.md#stepA)
 
 
 Mal was presented publicly for the first time in a lightning talk at
diff --git a/bash/Makefile b/bash/Makefile
index 5028788..dc1d1ad 100644
--- a/bash/Makefile
+++ b/bash/Makefile
@@ -1,5 +1,5 @@
 SOURCES_BASE = types.sh reader.sh printer.sh
-SOURCES_LISP = env.sh core.sh stepA_interop.sh
+SOURCES_LISP = env.sh core.sh stepA_mal.sh
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 all: mal.sh
diff --git a/bash/stepA_interop.sh b/bash/stepA_mal.sh
index 7b43496..7b43496 100755
--- a/bash/stepA_interop.sh
+++ b/bash/stepA_mal.sh
diff --git a/bash/tests/stepA_interop.mal b/bash/tests/stepA_mal.mal
index bf3eabd..bf3eabd 100644
--- a/bash/tests/stepA_interop.mal
+++ b/bash/tests/stepA_mal.mal
diff --git a/c/Makefile b/c/Makefile
index 81b384c..e51e04b 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -9,7 +9,7 @@ TESTS =
 SOURCES_BASE = readline.h readline.c types.h types.c \
                reader.h reader.c printer.h printer.c \
                interop.h interop.c
-SOURCES_LISP = env.c core.h core.c stepA_interop.c
+SOURCES_LISP = env.c core.h core.c stepA_mal.c
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 
@@ -17,7 +17,7 @@ SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 SRCS = step0_repl.c step1_read_print.c step2_eval.c step3_env.c \
        step4_if_fn_do.c step5_tco.c step6_file.c step7_quote.c \
-       step8_macros.c step9_try.c stepA_interop.c
+       step8_macros.c step9_try.c stepA_mal.c
 OBJS = $(SRCS:%.c=%.o)
 BINS = $(OBJS:%.o=%)
 OTHER_OBJS = types.o readline.o reader.o printer.o env.o core.o interop.o
diff --git a/c/stepA_interop.c b/c/stepA_mal.c
index 05e9f65..05e9f65 100644
--- a/c/stepA_interop.c
+++ b/c/stepA_mal.c
diff --git a/c/tests/stepA_interop.mal b/c/tests/stepA_mal.mal
index 657e3e7..657e3e7 100644
--- a/c/tests/stepA_interop.mal
+++ b/c/tests/stepA_mal.mal
diff --git a/clojure/Makefile b/clojure/Makefile
index 6d227a2..ec55ac1 100644
--- a/clojure/Makefile
+++ b/clojure/Makefile
@@ -1,5 +1,5 @@
 SOURCES_BASE = src/readline.clj src/reader.clj src/printer.clj
-SOURCES_LISP = src/env.clj src/core.clj src/stepA_interop.clj
+SOURCES_LISP = src/env.clj src/core.clj src/stepA_mal.clj
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 all:
diff --git a/clojure/src/stepA_interop.clj b/clojure/src/stepA_mal.clj
index 6ed9964..6ed9964 100644
--- a/clojure/src/stepA_interop.clj
+++ b/clojure/src/stepA_mal.clj
diff --git a/clojure/tests/stepA_interop.mal b/clojure/tests/stepA_mal.mal
index b323222..b323222 100644
--- a/clojure/tests/stepA_interop.mal
+++ b/clojure/tests/stepA_mal.mal
diff --git a/coffee/Makefile b/coffee/Makefile
index d2212ed..728d9f2 100644
--- a/coffee/Makefile
+++ b/coffee/Makefile
@@ -2,7 +2,7 @@ TESTS =
 
 SOURCES_BASE = node_readline.coffee types.coffee \
 	       reader.coffee printer.coffee
-SOURCES_LISP = env.coffee core.coffee stepA_interop.coffee
+SOURCES_LISP = env.coffee core.coffee stepA_mal.coffee
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #all: mal.rb
diff --git a/coffee/stepA_interop.coffee b/coffee/stepA_mal.coffee
index 751f9ad..751f9ad 100644
--- a/coffee/stepA_interop.coffee
+++ b/coffee/stepA_mal.coffee
diff --git a/coffee/tests/stepA_interop.mal b/coffee/tests/stepA_mal.mal
index f785292..f785292 100644
--- a/coffee/tests/stepA_interop.mal
+++ b/coffee/tests/stepA_mal.mal
diff --git a/cs/Makefile b/cs/Makefile
index 1fd1f7a..70d54ad 100644
--- a/cs/Makefile
+++ b/cs/Makefile
@@ -5,7 +5,7 @@ DEBUG =
 TESTS =
 
 SOURCES_BASE = readline.cs types.cs reader.cs printer.cs
-SOURCES_LISP = env.cs core.cs stepA_interop.cs
+SOURCES_LISP = env.cs core.cs stepA_mal.cs
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 OTHER_SOURCES = getline.cs
@@ -14,7 +14,7 @@ OTHER_SOURCES = getline.cs
 
 SRCS = step0_repl.cs step1_read_print.cs step2_eval.cs step3_env.cs \
        step4_if_fn_do.cs step5_tco.cs step6_file.cs step7_quote.cs \
-       step8_macros.cs step9_try.cs stepA_interop.cs
+       step8_macros.cs step9_try.cs stepA_mal.cs
 
 LIB_SRCS = $(filter-out step%,$(OTHER_SOURCES) $(SOURCES))
 
diff --git a/cs/stepA_interop.cs b/cs/stepA_mal.cs
index 6531d50..0ccb39e 100644
--- a/cs/stepA_interop.cs
+++ b/cs/stepA_mal.cs
@@ -14,7 +14,7 @@ using MalFunc = Mal.types.MalFunc;
 using Env = Mal.env.Env;
 
 namespace Mal {
-    class stepA_interop {
+    class stepA_mal {
         // read
         static MalVal READ(string str) {
             return reader.read_str(str);
diff --git a/docs/TODO b/docs/TODO
index e5b135b..e5a4fc1 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,7 +1,6 @@
 All:
     - Finish guide.md
 
-    - rename stepA_interop to stepA_mal
     - test to check args set properly
     - test to make sure slurp captures final newline
     - make sure errors propagate/print properly when self-hosted
@@ -94,7 +93,7 @@ Lua:
 Make:
     - allow '_' in make variable names
     - hash-map with space in key string
-    - Fix: make -f stepA_interop.mk ../mal/step6_file.mal
+    - Fix: make -f stepA_mal.mk ../mal/step6_file.mal
         (slurp "../tests/incA.mal")
         (read-string "(+ 2 3)")
     - errors should propagate up from within load-file
@@ -121,7 +120,7 @@ Postscript:
     - formatting messed up with mal/clojurewest2014.mal
 
 Python:
-    - error: python ../python/stepA_interop.py ../mal/stepA_interop.mal ../mal/stepA_interop.mal
+    - error: python ../python/stepA_mal.py ../mal/stepA_mal.mal ../mal/stepA_mal.mal
     - interop tests
 
 R:
diff --git a/docs/step_notes.txt b/docs/step_notes.txt
index f36575d..e28761a 100644
--- a/docs/step_notes.txt
+++ b/docs/step_notes.txt
@@ -405,7 +405,7 @@ Step Notes:
 - Other misc:
     - conj function
 
-- stepA_interop
+- stepA_mal
     - convert returned data to mal data
         - recursive, similar to pr_str
     - Details:
diff --git a/forth/Makefile b/forth/Makefile
index 400b463..29bf799 100644
--- a/forth/Makefile
+++ b/forth/Makefile
@@ -1,5 +1,5 @@
 SOURCES_BASE = types.fs str.fs reader.fs printer.fs
-SOURCES_LISP = env.fs core.fs stepA_interop.fs
+SOURCES_LISP = env.fs core.fs stepA_mal.fs
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 .PHONY: stats tests $(TESTS)
diff --git a/forth/stepA_interop.fs b/forth/stepA_mal.fs
index af5f5d8..af5f5d8 100644
--- a/forth/stepA_interop.fs
+++ b/forth/stepA_mal.fs
diff --git a/forth/tests/stepA_interop.mal b/forth/tests/stepA_mal.mal
index c4a0e75..c4a0e75 100644
--- a/forth/tests/stepA_interop.mal
+++ b/forth/tests/stepA_mal.mal
diff --git a/go/Makefile b/go/Makefile
index 5c966f5..67e967b 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -6,14 +6,14 @@ SOURCES_BASE = src/types/types.go src/readline/readline.go \
 	       src/reader/reader.go src/printer/printer.go \
 	       src/env/env.go src/core/core.go
 SOURCES_LISP = src/env/env.go src/core/core.go \
-	       src/stepA_interop/stepA_interop.go
+	       src/stepA_mal/stepA_mal.go
 SOURCES = $(SOURCES_BASE) $(word $(words $(SOURCES_LISP)),${SOURCES_LISP})
 
 #####################
 
 SRCS = step0_repl.go step1_read_print.go step2_eval.go step3_env.go \
        step4_if_fn_do.go step5_tco.go step6_file.go step7_quote.go \
-       step8_macros.go step9_try.go stepA_interop.go
+       step8_macros.go step9_try.go stepA_mal.go
 BINS = $(SRCS:%.go=%)
 
 #####################
diff --git a/go/src/stepA_interop/stepA_interop.go b/go/src/stepA_mal/stepA_mal.go
index 808022a..808022a 100644
--- a/go/src/stepA_interop/stepA_interop.go
+++ b/go/src/stepA_mal/stepA_mal.go
diff --git a/haskell/Makefile b/haskell/Makefile
index 28c3d26..0ac1a75 100644
--- a/haskell/Makefile
+++ b/haskell/Makefile
@@ -6,7 +6,7 @@ SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 SRCS = step0_repl.hs step1_read_print.hs step2_eval.hs step3_env.hs \
        step4_if_fn_do.hs step5_tco.hs step6_file.hs step7_quote.hs \
-       step8_macros.hs step9_try.hs stepA_interop.hs
+       step8_macros.hs step9_try.hs stepA_mal.hs
 OTHER_SRCS = Readline.hs Types.hs Reader.hs Printer.hs Env.hs Core.hs
 BINS = $(SRCS:%.hs=%)
 
diff --git a/haskell/stepA_interop.hs b/haskell/stepA_mal.hs
index f1d4b38..f1d4b38 100644
--- a/haskell/stepA_interop.hs
+++ b/haskell/stepA_mal.hs
diff --git a/java/Makefile b/java/Makefile
index eff6e6f..f242ec0 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -5,7 +5,7 @@ TESTS =
 SOURCES_BASE = src/main/java/mal/readline.java src/main/java/mal/types.java \
                src/main/java/mal/reader.java src/main/java/mal/printer.java
 SOURCES_LISP = src/main/java/mal/env.java src/main/java/mal/core.java \
-               src/main/java/mal/stepA_interop.java
+               src/main/java/mal/stepA_mal.java
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #.PHONY: stats tests $(TESTS)
diff --git a/java/pom.xml b/java/pom.xml
index ae53194..fa2b567 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -47,7 +47,7 @@
                 </executions>
                 <configuration>
                     <!--
-                    <mainClass>mal.stepA_interop</mainClass>
+                    <mainClass>mal.stepA_mal</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_interop</mainClass>
+                                    <mainClass>mal.stepA_mal</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>
diff --git a/java/src/main/java/mal/stepA_interop.java b/java/src/main/java/mal/stepA_mal.java
index 1fa1125..f8d4056 100644
--- a/java/src/main/java/mal/stepA_interop.java
+++ b/java/src/main/java/mal/stepA_mal.java
@@ -15,7 +15,7 @@ import mal.printer;
 import mal.env.Env;
 import mal.core;
 
-public class stepA_interop {
+public class stepA_mal {
     // read
     public static MalVal READ(String str) throws MalThrowable {
         return reader.read_str(str);
diff --git a/js/Makefile b/js/Makefile
index 09ed5a4..98c4291 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -2,7 +2,7 @@
 TESTS = tests/types.js tests/reader.js
 
 SOURCES_BASE = node_readline.js types.js reader.js printer.js
-SOURCES_LISP = env.js core.js stepA_interop.js
+SOURCES_LISP = env.js core.js stepA_mal.js
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 WEB_SOURCES = $(SOURCES:node_readline.js=jq_readline.js)
 
diff --git a/js/stepA_interop.js b/js/stepA_mal.js
index d879cd3..d879cd3 100644
--- a/js/stepA_interop.js
+++ b/js/stepA_mal.js
diff --git a/js/tests/stepA_interop.mal b/js/tests/stepA_mal.mal
index f785292..f785292 100644
--- a/js/tests/stepA_interop.mal
+++ b/js/tests/stepA_mal.mal
diff --git a/lua/Makefile b/lua/Makefile
index d1498bd..169c587 100644
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -1,7 +1,7 @@
 TESTS =
 
 SOURCES_BASE = utils.lua types.lua reader.lua printer.lua
-SOURCES_LISP = env.lua core.lua stepA_interop.lua
+SOURCES_LISP = env.lua core.lua stepA_mal.lua
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 all: libs
diff --git a/lua/stepA_interop.lua b/lua/stepA_mal.lua
index 430fffc..430fffc 100755
--- a/lua/stepA_interop.lua
+++ b/lua/stepA_mal.lua
diff --git a/make/Makefile b/make/Makefile
index 39658ac..70dea08 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -1,9 +1,9 @@
 
-TESTS = tests/types.mk tests/reader.mk tests/stepA_interop.mk
+TESTS = tests/types.mk tests/reader.mk tests/stepA_mal.mk
 
 SOURCES_BASE = util.mk numbers.mk readline.mk gmsl.mk types.mk \
                reader.mk printer.mk
-SOURCES_LISP = env.mk core.mk stepA_interop.mk
+SOURCES_LISP = env.mk core.mk stepA_mal.mk
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 mal.mk: $(SOURCES)
diff --git a/make/stepA_interop.mk b/make/stepA_mal.mk
index 80909c7..80909c7 100644
--- a/make/stepA_interop.mk
+++ b/make/stepA_mal.mk
diff --git a/make/tests/stepA_interop.mal b/make/tests/stepA_mal.mal
index 9b1a2f9..9b1a2f9 100644
--- a/make/tests/stepA_interop.mal
+++ b/make/tests/stepA_mal.mal
diff --git a/mal/Makefile b/mal/Makefile
index 1990b6b..0848621 100644
--- a/mal/Makefile
+++ b/mal/Makefile
@@ -2,7 +2,7 @@
 TESTS =
 
 SOURCES_BASE =
-SOURCES_LISP = env.mal core.mal stepA_interop.mal
+SOURCES_LISP = env.mal core.mal stepA_mal.mal
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #.PHONY: stats tests $(TESTS)
diff --git a/mal/stepA_interop.mal b/mal/stepA_mal.mal
index 3e2a258..3e2a258 100644
--- a/mal/stepA_interop.mal
+++ b/mal/stepA_mal.mal
diff --git a/matlab/Makefile b/matlab/Makefile
index a603822..f03d94d 100644
--- a/matlab/Makefile
+++ b/matlab/Makefile
@@ -2,7 +2,7 @@ SOURCES_BASE = types.m types/Nil.m types/MalException.m \
 	       types/Symbol.m types/List.m types/Vector.m \
 	       types/HashMap.m types/Function.m types/Atom.m \
 	       Reader.m reader.m printer.m
-SOURCES_LISP = Env.m core.m stepA_interop.m
+SOURCES_LISP = Env.m core.m stepA_mal.m
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 
diff --git a/matlab/stepA_interop.m b/matlab/stepA_mal.m
index 5b8e720..6f74b6a 100644
--- a/matlab/stepA_interop.m
+++ b/matlab/stepA_mal.m
@@ -1,4 +1,4 @@
-function stepA_interop(varargin), main(varargin), end
+function stepA_mal(varargin), main(varargin), end
 
 % read
 function ret = READ(str)
diff --git a/miniMAL/Makefile b/miniMAL/Makefile
index 9e31c40..8c838d3 100644
--- a/miniMAL/Makefile
+++ b/miniMAL/Makefile
@@ -1,7 +1,7 @@
 
 SOURCES_BASE = node_readline.js miniMAL-core.json \
 	       types.json reader.json printer.json
-SOURCES_LISP = env.json core.json stepA_interop.json
+SOURCES_LISP = env.json core.json stepA_mal.json
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 .PHONY: stats tests $(TESTS)
diff --git a/miniMAL/stepA_interop.json b/miniMAL/stepA_mal.json
index 2181d30..2181d30 100644
--- a/miniMAL/stepA_interop.json
+++ b/miniMAL/stepA_mal.json
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 71c7e6b..9245dd5 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,6 +1,6 @@
 STEPS = step0_repl.ml step1_read_print.ml step2_eval.ml step3_env.ml \
         step4_if_fn_do.ml step5_tco.ml step6_file.ml step7_quote.ml \
-	step8_macros.ml step9_try.ml stepA_interop.ml
+	step8_macros.ml step9_try.ml stepA_mal.ml
 MODULES = types.ml reader.ml printer.ml env.ml core.ml
 LIBS = str.cmxa unix.cmxa
 MAL_LIB = mal_lib.cmxa
@@ -28,10 +28,10 @@ $(STEP_BINS): %: %.ml $(MAL_LIB)
 clean:
 	rm -f $(STEP_BINS) mal mal_lib.* *.cmo *.cmx *.cmi *.o
 
-stats: $(MODULES) stepA_interop.ml
+stats: $(MODULES) stepA_mal.ml
 	@wc $^
 
-stats-lisp: env.ml core.ml stepA_interop.ml
+stats-lisp: env.ml core.ml stepA_mal.ml
 	@wc $^
 
 .PHONY: all repl clean stats stats-lisp
diff --git a/ocaml/stepA_interop.ml b/ocaml/stepA_mal.ml
index 1aab28a..1aab28a 100644
--- a/ocaml/stepA_interop.ml
+++ b/ocaml/stepA_mal.ml
diff --git a/perl/Makefile b/perl/Makefile
index d8e95a0..0aed9c6 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -2,7 +2,7 @@ TESTS =
 
 SOURCES_BASE = readline.pm types.pm reader.pm printer.pm \
                interop.pm
-SOURCES_LISP = env.pm core.pm stepA_interop.pl
+SOURCES_LISP = env.pm core.pm stepA_mal.pl
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #all: mal.pl
diff --git a/perl/stepA_interop.pl b/perl/stepA_mal.pl
index 7993635..7993635 100644
--- a/perl/stepA_interop.pl
+++ b/perl/stepA_mal.pl
diff --git a/perl/tests/stepA_interop.mal b/perl/tests/stepA_mal.mal
index 1335be4..1335be4 100644
--- a/perl/tests/stepA_interop.mal
+++ b/perl/tests/stepA_mal.mal
diff --git a/php/Makefile b/php/Makefile
index d9fd2d4..659e89c 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -2,7 +2,7 @@
 TESTS =
 
 SOURCES_BASE = readline.php types.php reader.php printer.php
-SOURCES_LISP = env.php core.php stepA_interop.php
+SOURCES_LISP = env.php core.php stepA_mal.php
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 .PHONY: stats tests $(TESTS)
diff --git a/php/stepA_interop.php b/php/stepA_mal.php
index 1dc3b04..1dc3b04 100644
--- a/php/stepA_interop.php
+++ b/php/stepA_mal.php
diff --git a/php/tests/stepA_interop.mal b/php/tests/stepA_mal.mal
index 15f8a94..15f8a94 100644
--- a/php/tests/stepA_interop.mal
+++ b/php/tests/stepA_mal.mal
diff --git a/process/guide.md b/process/guide.md
index 734dc32..1cae879 100644
--- a/process/guide.md
+++ b/process/guide.md
@@ -1151,15 +1151,15 @@ diff -urp ../process/step8_macros.txt ../process/step9_try.txt
 
 ### Step A: Interop and Self-hosting
 
-![stepA_interop architecture](stepA_interop.png)
+![stepA_mal architecture](stepA_mal.png)
 
 Compare the pseudocode for step 9 and step A to get a basic idea of
 the changes that will be made during this step:
 ```
-diff -urp ../process/step9_try.txt ../process/stepA_interop.txt
+diff -urp ../process/step9_try.txt ../process/stepA_mal.txt
 ```
 
-* Copy `step9_try.qx` to `stepA_interop.qx`.
+* Copy `step9_try.qx` to `stepA_mal.qx`.
 
 * TODO/TBD
 
diff --git a/process/stepA_interop.gliffy b/process/stepA_mal.gliffy
index 7d4920f..7d4920f 100644
--- a/process/stepA_interop.gliffy
+++ b/process/stepA_mal.gliffy
diff --git a/process/stepA_interop.png b/process/stepA_mal.png
index 28dcb5b..28dcb5b 100644
--- a/process/stepA_interop.png
+++ b/process/stepA_mal.png
diff --git a/process/stepA_interop.txt b/process/stepA_mal.txt
index 8d36f31..6c1e71e 100644
--- a/process/stepA_interop.txt
+++ b/process/stepA_mal.txt
@@ -1,4 +1,4 @@
---- stepA_interop -------------------------------
+--- stepA_mal -------------------------------
 import types, reader, printer, env, core
 
 READ(str): return reader.read_str(str)
diff --git a/ps/Makefile b/ps/Makefile
index 26056a6..9131674 100644
--- a/ps/Makefile
+++ b/ps/Makefile
@@ -2,7 +2,7 @@
 TESTS =
 
 SOURCES_BASE = types.ps reader.ps printer.ps
-SOURCES_LISP = env.ps core.ps stepA_interop.ps
+SOURCES_LISP = env.ps core.ps stepA_mal.ps
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 .PHONY: stats tests $(TESTS)
diff --git a/ps/stepA_interop.ps b/ps/stepA_mal.ps
index c879294..c879294 100644
--- a/ps/stepA_interop.ps
+++ b/ps/stepA_mal.ps
diff --git a/ps/tests/stepA_mal.mal b/ps/tests/stepA_mal.mal
new file mode 100644
index 0000000..fffa178
--- /dev/null
+++ b/ps/tests/stepA_mal.mal
@@ -0,0 +1,23 @@
+;; Testing basic ps interop
+
+(ps* "7")
+;=>(7)
+
+(ps* "(7)")
+;=>("7")
+
+(ps* "7 8 9 3 array astore")
+;=>((7 8 9))
+
+(ps* "1 1 eq")
+;=>(true)
+
+(ps* "/sym")
+;=>sym
+
+(ps* "1 1 eq { (yep) }{ (nope) } ifelse")
+;=>("yep")
+
+(ps* "1 0 eq { (yep) }{ (nope) } ifelse")
+;=>("nope")
+
diff --git a/python/Makefile b/python/Makefile
index 6e51430..7842eae 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -3,7 +3,7 @@ TESTS =
 
 
 SOURCES_BASE = mal_readline.py mal_types.py reader.py printer.py
-SOURCES_LISP = env.py core.py stepA_interop.py
+SOURCES_LISP = env.py core.py stepA_mal.py
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 
diff --git a/python/stepA_interop.py b/python/stepA_mal.py
index 93cdb2e..93cdb2e 100644
--- a/python/stepA_interop.py
+++ b/python/stepA_mal.py
diff --git a/r/Makefile b/r/Makefile
index 9d1a35d..4d1ec24 100644
--- a/r/Makefile
+++ b/r/Makefile
@@ -1,7 +1,7 @@
 TESTS =
 
 SOURCES_BASE = readline.r types.r reader.r printer.r
-SOURCES_LISP = env.r core.r stepA_interop.r
+SOURCES_LISP = env.r core.r stepA_mal.r
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 all: libs
diff --git a/r/stepA_interop.r b/r/stepA_mal.r
index e699048..e699048 100644
--- a/r/stepA_interop.r
+++ b/r/stepA_mal.r
diff --git a/racket/Makefile b/racket/Makefile
index a472c2f..01cb12a 100644
--- a/racket/Makefile
+++ b/racket/Makefile
@@ -1,5 +1,5 @@
 SOURCES_BASE = types.rkt reader.rkt printer.rkt
-SOURCES_LISP = env.rkt core.rkt stepA_interop.rkt
+SOURCES_LISP = env.rkt core.rkt stepA_mal.rkt
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 all:
diff --git a/racket/stepA_interop.rkt b/racket/stepA_mal.rkt
index 9b816cb..9b816cb 100755
--- a/racket/stepA_interop.rkt
+++ b/racket/stepA_mal.rkt
diff --git a/ruby/Makefile b/ruby/Makefile
index f9792f5..2241a4e 100644
--- a/ruby/Makefile
+++ b/ruby/Makefile
@@ -1,7 +1,7 @@
 TESTS =
 
 SOURCES_BASE = mal_readline.rb types.rb reader.rb printer.rb
-SOURCES_LISP = env.rb core.rb stepA_interop.rb
+SOURCES_LISP = env.rb core.rb stepA_mal.rb
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #all: mal.rb
diff --git a/ruby/stepA_interop.rb b/ruby/stepA_mal.rb
index 1eff1f1..1eff1f1 100644
--- a/ruby/stepA_interop.rb
+++ b/ruby/stepA_mal.rb
diff --git a/ruby/tests/stepA_interop.mal b/ruby/tests/stepA_mal.mal
index 2d7efb8..2d7efb8 100644
--- a/ruby/tests/stepA_interop.mal
+++ b/ruby/tests/stepA_mal.mal
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index d382d32..daf999d 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -36,4 +36,4 @@ name = "step8_macros"
 [[bin]]
 name = "step9_try"
 [[bin]]
-name = "stepA_interop"
+name = "stepA_mal"
diff --git a/rust/Makefile b/rust/Makefile
index 6910356..da8a6c6 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -3,14 +3,14 @@
 SOURCES_BASE = src/types.rs src/readline.rs \
 	       src/reader.rs src/printer.rs \
 	       src/env.rs src/core.rs
-SOURCES_LISP = src/env.rs src/core.rs src/stepA_interop.rs
+SOURCES_LISP = src/env.rs src/core.rs src/stepA_mal.rs
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #####################
 
 SRCS = step1_read_print.rs step2_eval.rs step3_env.rs \
        step4_if_fn_do.rs step5_tco.rs step6_file.rs step7_quote.rs \
-       step8_macros.rs step9_try.rs stepA_interop.rs
+       step8_macros.rs step9_try.rs stepA_mal.rs
 BINS = $(SRCS:%.rs=target/%)
 
 #####################
diff --git a/rust/src/stepA_interop.rs b/rust/src/stepA_mal.rs
index 8e30867..8e30867 100644
--- a/rust/src/stepA_interop.rs
+++ b/rust/src/stepA_mal.rs
diff --git a/scala/Makefile b/scala/Makefile
index 10c2e11..29dd8aa 100644
--- a/scala/Makefile
+++ b/scala/Makefile
@@ -1,7 +1,7 @@
 TESTS =
 
 SOURCES_BASE = types.scala reader.scala printer.scala
-SOURCES_LISP = env.scala core.scala stepA_interop.scala
+SOURCES_LISP = env.scala core.scala stepA_mal.scala
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #all: mal.scala
diff --git a/scala/stepA_interop.scala b/scala/stepA_mal.scala
index 2ba6b5a..5230cb1 100644
--- a/scala/stepA_interop.scala
+++ b/scala/stepA_mal.scala
@@ -2,7 +2,7 @@ import types.{MalList, _list, _list_Q, MalVector, MalHashMap,
               Func, MalFunction}
 import env.Env
 
-object stepA_interop {
+object stepA_mal {
   // read
   def READ(str: String): Any = {
     reader.read_str(str)
diff --git a/vb/Makefile b/vb/Makefile
index d9ce097..25d9b96 100644
--- a/vb/Makefile
+++ b/vb/Makefile
@@ -5,14 +5,14 @@ DEBUG =
 TESTS =
 
 SOURCES_BASE = readline.vb types.vb reader.vb printer.vb
-SOURCES_LISP = env.vb core.vb stepA_interop.vb
+SOURCES_LISP = env.vb core.vb stepA_mal.vb
 SOURCES = $(SOURCES_BASE) $(SOURCES_LISP)
 
 #####################
 
 SRCS = step0_repl.vb step1_read_print.vb step2_eval.vb \
        step3_env.vb step4_if_fn_do.vb step5_tco.vb step6_file.vb \
-       step7_quote.vb step8_macros.vb step9_try.vb stepA_interop.vb
+       step7_quote.vb step8_macros.vb step9_try.vb stepA_mal.vb
 
 LIB_CS_SRCS = getline.cs
 LIB_VB_SRCS = $(filter-out step%,$(filter %.vb,$(SOURCES)))
diff --git a/vb/stepA_interop.vb b/vb/stepA_mal.vb
index f9af038..6778e0a 100644
--- a/vb/stepA_interop.vb
+++ b/vb/stepA_mal.vb
@@ -13,7 +13,7 @@ Imports MalFunc = Mal.types.MalFunc
 Imports MalEnv = Mal.env.Env
 
 Namespace Mal
-    Class stepA_interop
+    Class stepA_mal
         ' read
         Shared Function READ(str As String) As MalVal
             Return reader.read_str(str)