From 90f618cbe7ac7740accf501a75be6972bd95be1a Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Sat, 28 Feb 2015 11:09:54 -0600
Subject: All: rename stepA_interop to stepA_mal

Also, add missed postscript interop tests.
---
 java/Makefile                             |   2 +-
 java/pom.xml                              |   4 +-
 java/src/main/java/mal/stepA_interop.java | 301 ------------------------------
 java/src/main/java/mal/stepA_mal.java     | 301 ++++++++++++++++++++++++++++++
 4 files changed, 304 insertions(+), 304 deletions(-)
 delete mode 100644 java/src/main/java/mal/stepA_interop.java
 create mode 100644 java/src/main/java/mal/stepA_mal.java

(limited to 'java')

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_interop.java
deleted file mode 100644
index 1fa1125..0000000
--- a/java/src/main/java/mal/stepA_interop.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package mal;
-
-import java.io.IOException;
-
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import mal.types.*;
-import mal.readline;
-import mal.reader;
-import mal.printer;
-import mal.env.Env;
-import mal.core;
-
-public class stepA_interop {
-    // read
-    public static MalVal READ(String str) throws MalThrowable {
-        return reader.read_str(str);
-    }
-
-    // eval
-    public static Boolean is_pair(MalVal x) {
-        return x instanceof MalList && ((MalList)x).size() > 0;
-    }
-
-    public static MalVal quasiquote(MalVal ast) {
-        if (!is_pair(ast)) {
-            return new MalList(new MalSymbol("quote"), ast);
-        } else {
-            MalVal a0 = ((MalList)ast).nth(0);
-            if ((a0 instanceof MalSymbol) &&
-                (((MalSymbol)a0).getName() == "unquote")) {
-                return ((MalList)ast).nth(1);
-            } else if (is_pair(a0)) {
-                MalVal a00 = ((MalList)a0).nth(0);
-                if ((a00 instanceof MalSymbol) &&
-                    (((MalSymbol)a00).getName() == "splice-unquote")) {
-                    return new MalList(new MalSymbol("concat"),
-                                       ((MalList)a0).nth(1),
-                                       quasiquote(((MalList)ast).rest()));
-                }
-            }
-            return new MalList(new MalSymbol("cons"),
-                               quasiquote(a0),
-                               quasiquote(((MalList)ast).rest()));
-        }
-    }
-
-    public static Boolean is_macro_call(MalVal ast, Env env)
-            throws MalThrowable {
-        if (ast instanceof MalList) {
-            MalVal a0 = ((MalList)ast).nth(0);
-            if (a0 instanceof MalSymbol &&
-                env.find(((MalSymbol)a0)) != null) {
-                MalVal mac = env.get(((MalSymbol)a0));
-                if (mac instanceof MalFunction &&
-                    ((MalFunction)mac).isMacro()) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public static MalVal macroexpand(MalVal ast, Env env)
-            throws MalThrowable {
-        while (is_macro_call(ast, env)) {
-            MalSymbol a0 = (MalSymbol)((MalList)ast).nth(0);
-            MalFunction mac = (MalFunction) env.get(a0);
-            ast = mac.apply(((MalList)ast).rest());
-        }
-        return ast;
-    }
-
-    public static MalVal eval_ast(MalVal ast, Env env) throws MalThrowable {
-        if (ast instanceof MalSymbol) {
-            return env.get((MalSymbol)ast);
-        } else if (ast instanceof MalList) {
-            MalList old_lst = (MalList)ast;
-            MalList new_lst = ast.list_Q() ? new MalList()
-                                           : (MalList)new MalVector();
-            for (MalVal mv : (List<MalVal>)old_lst.value) {
-                new_lst.conj_BANG(EVAL(mv, env));
-            }
-            return new_lst;
-        } else if (ast instanceof MalHashMap) {
-            MalHashMap new_hm = new MalHashMap();
-            Iterator it = ((MalHashMap)ast).value.entrySet().iterator();
-            while (it.hasNext()) {
-                Map.Entry entry = (Map.Entry)it.next();
-                new_hm.value.put(entry.getKey(), EVAL((MalVal)entry.getValue(), env));
-            }
-            return new_hm;
-        } else {
-            return ast;
-        }
-    }
-
-    public static MalVal EVAL(MalVal orig_ast, Env env) throws MalThrowable {
-        MalVal a0, a1,a2, a3, res;
-        MalList el;
-
-        while (true) {
-
-        //System.out.println("EVAL: " + printer._pr_str(orig_ast, true));
-        if (!orig_ast.list_Q()) {
-            return eval_ast(orig_ast, env);
-        }
-
-        // apply list
-        MalVal expanded = macroexpand(orig_ast, env);
-        if (!expanded.list_Q()) { return expanded; } 
-        MalList ast = (MalList) expanded;
-        if (ast.size() == 0) { return ast; }
-        a0 = ast.nth(0);
-        String a0sym = a0 instanceof MalSymbol ? ((MalSymbol)a0).getName()
-                                               : "__<*fn*>__";
-        switch (a0sym) {
-        case "def!":
-            a1 = ast.nth(1);
-            a2 = ast.nth(2);
-            res = EVAL(a2, env);
-            env.set(((MalSymbol)a1), res);
-            return res;
-        case "let*":
-            a1 = ast.nth(1);
-            a2 = ast.nth(2);
-            MalSymbol key;
-            MalVal val;
-            Env let_env = new Env(env);
-            for(int i=0; i<((MalList)a1).size(); i+=2) {
-                key = (MalSymbol)((MalList)a1).nth(i);
-                val = ((MalList)a1).nth(i+1);
-                let_env.set(key, EVAL(val, let_env));
-            }
-            orig_ast = a2;
-            env = let_env;
-            break;
-        case "quote":
-            return ast.nth(1);
-        case "quasiquote":
-            orig_ast = quasiquote(ast.nth(1));
-            break;
-        case "defmacro!":
-            a1 = ast.nth(1);
-            a2 = ast.nth(2);
-            res = EVAL(a2, env);
-            ((MalFunction)res).setMacro();
-            env.set((MalSymbol)a1, res);
-            return res;
-        case "macroexpand":
-            a1 = ast.nth(1);
-            return macroexpand(a1, env);
-        case "try*":
-            try {
-                return EVAL(ast.nth(1), env);
-            } catch (Throwable t) {
-                if (ast.size() > 2) {
-                    MalVal exc;
-                    a2 = ast.nth(2);
-                    MalVal a20 = ((MalList)a2).nth(0);
-                    if (((MalSymbol)a20).getName().equals("catch*")) {
-                        if (t instanceof MalException) {
-                            exc = ((MalException)t).getValue();
-                        } else {
-                            StringWriter sw = new StringWriter();
-                            t.printStackTrace(new PrintWriter(sw));
-                            String tstr = sw.toString();
-                            exc = new MalString(t.getMessage() + ": " + tstr);
-                        }
-                        return EVAL(((MalList)a2).nth(2),
-                                    new Env(env, ((MalList)a2).slice(1,2),
-                                                 new MalList(exc)));
-                    }
-                }
-                throw t;
-            }
-        case "do":
-            eval_ast(ast.slice(1, ast.size()-1), env);
-            orig_ast = ast.nth(ast.size()-1);
-            break;
-        case "if":
-            a1 = ast.nth(1);
-            MalVal cond = EVAL(a1, env);
-            if (cond == types.Nil || cond == types.False) {
-                // eval false slot form
-                if (ast.size() > 3) {
-                    orig_ast = ast.nth(3);
-                } else {
-                    return types.Nil;
-                }
-            } else {
-                // eval true slot form
-                orig_ast = ast.nth(2);
-            }
-            break;
-        case "fn*":
-            final MalList a1f = (MalList)ast.nth(1);
-            final MalVal a2f = ast.nth(2);
-            final Env cur_env = env;
-            return new MalFunction (a2f, (mal.env.Env)env, a1f) {
-                public MalVal apply(MalList args) throws MalThrowable {
-                    return EVAL(a2f, new Env(cur_env, a1f, args));
-                }
-            };
-        default:
-            el = (MalList)eval_ast(ast, env);
-            MalFunction f = (MalFunction)el.nth(0);
-            MalVal fnast = f.getAst();
-            if (fnast != null) {
-                orig_ast = fnast;
-                env = f.genEnv(el.slice(1));
-            } else {
-                return f.apply(el.rest());
-            }
-        }
-
-        }
-    }
-
-    // print
-    public static String PRINT(MalVal exp) {
-        return printer._pr_str(exp, true);
-    }
-
-    // repl
-    public static MalVal RE(Env env, String str) throws MalThrowable {
-        return EVAL(READ(str), env);
-    }
-
-    public static void main(String[] args) throws MalThrowable {
-        String prompt = "user> ";
-
-        final Env repl_env = new Env(null);
-
-        // core.java: defined using Java
-        for (String key : core.ns.keySet()) {
-            repl_env.set(new MalSymbol(key), core.ns.get(key));
-        }
-        repl_env.set(new MalSymbol("eval"), new MalFunction() {
-            public MalVal apply(MalList args) throws MalThrowable {
-                return EVAL(args.nth(0), repl_env);
-            }
-        });
-        MalList _argv = new MalList();
-        for (Integer i=1; i < args.length; i++) {
-            _argv.conj_BANG(new MalString(args[i]));
-        }
-        repl_env.set(new MalSymbol("*ARGV*"), _argv);
-
-
-        // core.mal: defined using the language itself
-        RE(repl_env, "(def! *host-language* \"java\")");
-        RE(repl_env, "(def! not (fn* (a) (if a false true)))");
-        RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
-        RE(repl_env, "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
-        RE(repl_env, "(defmacro! or (fn* (& xs) (if (empty? xs) nil (if (= 1 (count xs)) (first xs) `(let* (or_FIXME ~(first xs)) (if or_FIXME or_FIXME (or ~@(rest xs))))))))");
-        
-        Integer fileIdx = 0;
-        if (args.length > 0 && args[0].equals("--raw")) {
-            readline.mode = readline.Mode.JAVA;
-            fileIdx = 1;
-        }
-        if (args.length > fileIdx) {
-            RE(repl_env, "(load-file \"" + args[fileIdx] + "\")");
-            return;
-        }
-
-        // repl loop
-        RE(repl_env, "(println (str \"Mal [\" *host-language* \"]\"))");
-        while (true) {
-            String line;
-            try {
-                line = readline.readline(prompt);
-                if (line == null) { continue; }
-            } catch (readline.EOFException e) {
-                break;
-            } catch (IOException e) {
-                System.out.println("IOException: " + e.getMessage());
-                break;
-            }
-            try {
-                System.out.println(PRINT(RE(repl_env, line)));
-            } catch (MalContinue e) {
-                continue;
-            } catch (MalException e) {
-                System.out.println("Error: " + printer._pr_str(e.getValue(), false));
-                continue;
-            } catch (MalThrowable t) {
-                System.out.println("Error: " + t.getMessage());
-                continue;
-            } catch (Throwable t) {
-                System.out.println("Uncaught " + t + ": " + t.getMessage());
-                continue;
-            }
-        }
-    }
-}
diff --git a/java/src/main/java/mal/stepA_mal.java b/java/src/main/java/mal/stepA_mal.java
new file mode 100644
index 0000000..f8d4056
--- /dev/null
+++ b/java/src/main/java/mal/stepA_mal.java
@@ -0,0 +1,301 @@
+package mal;
+
+import java.io.IOException;
+
+import java.io.StringWriter;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+import mal.types.*;
+import mal.readline;
+import mal.reader;
+import mal.printer;
+import mal.env.Env;
+import mal.core;
+
+public class stepA_mal {
+    // read
+    public static MalVal READ(String str) throws MalThrowable {
+        return reader.read_str(str);
+    }
+
+    // eval
+    public static Boolean is_pair(MalVal x) {
+        return x instanceof MalList && ((MalList)x).size() > 0;
+    }
+
+    public static MalVal quasiquote(MalVal ast) {
+        if (!is_pair(ast)) {
+            return new MalList(new MalSymbol("quote"), ast);
+        } else {
+            MalVal a0 = ((MalList)ast).nth(0);
+            if ((a0 instanceof MalSymbol) &&
+                (((MalSymbol)a0).getName() == "unquote")) {
+                return ((MalList)ast).nth(1);
+            } else if (is_pair(a0)) {
+                MalVal a00 = ((MalList)a0).nth(0);
+                if ((a00 instanceof MalSymbol) &&
+                    (((MalSymbol)a00).getName() == "splice-unquote")) {
+                    return new MalList(new MalSymbol("concat"),
+                                       ((MalList)a0).nth(1),
+                                       quasiquote(((MalList)ast).rest()));
+                }
+            }
+            return new MalList(new MalSymbol("cons"),
+                               quasiquote(a0),
+                               quasiquote(((MalList)ast).rest()));
+        }
+    }
+
+    public static Boolean is_macro_call(MalVal ast, Env env)
+            throws MalThrowable {
+        if (ast instanceof MalList) {
+            MalVal a0 = ((MalList)ast).nth(0);
+            if (a0 instanceof MalSymbol &&
+                env.find(((MalSymbol)a0)) != null) {
+                MalVal mac = env.get(((MalSymbol)a0));
+                if (mac instanceof MalFunction &&
+                    ((MalFunction)mac).isMacro()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static MalVal macroexpand(MalVal ast, Env env)
+            throws MalThrowable {
+        while (is_macro_call(ast, env)) {
+            MalSymbol a0 = (MalSymbol)((MalList)ast).nth(0);
+            MalFunction mac = (MalFunction) env.get(a0);
+            ast = mac.apply(((MalList)ast).rest());
+        }
+        return ast;
+    }
+
+    public static MalVal eval_ast(MalVal ast, Env env) throws MalThrowable {
+        if (ast instanceof MalSymbol) {
+            return env.get((MalSymbol)ast);
+        } else if (ast instanceof MalList) {
+            MalList old_lst = (MalList)ast;
+            MalList new_lst = ast.list_Q() ? new MalList()
+                                           : (MalList)new MalVector();
+            for (MalVal mv : (List<MalVal>)old_lst.value) {
+                new_lst.conj_BANG(EVAL(mv, env));
+            }
+            return new_lst;
+        } else if (ast instanceof MalHashMap) {
+            MalHashMap new_hm = new MalHashMap();
+            Iterator it = ((MalHashMap)ast).value.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry entry = (Map.Entry)it.next();
+                new_hm.value.put(entry.getKey(), EVAL((MalVal)entry.getValue(), env));
+            }
+            return new_hm;
+        } else {
+            return ast;
+        }
+    }
+
+    public static MalVal EVAL(MalVal orig_ast, Env env) throws MalThrowable {
+        MalVal a0, a1,a2, a3, res;
+        MalList el;
+
+        while (true) {
+
+        //System.out.println("EVAL: " + printer._pr_str(orig_ast, true));
+        if (!orig_ast.list_Q()) {
+            return eval_ast(orig_ast, env);
+        }
+
+        // apply list
+        MalVal expanded = macroexpand(orig_ast, env);
+        if (!expanded.list_Q()) { return expanded; } 
+        MalList ast = (MalList) expanded;
+        if (ast.size() == 0) { return ast; }
+        a0 = ast.nth(0);
+        String a0sym = a0 instanceof MalSymbol ? ((MalSymbol)a0).getName()
+                                               : "__<*fn*>__";
+        switch (a0sym) {
+        case "def!":
+            a1 = ast.nth(1);
+            a2 = ast.nth(2);
+            res = EVAL(a2, env);
+            env.set(((MalSymbol)a1), res);
+            return res;
+        case "let*":
+            a1 = ast.nth(1);
+            a2 = ast.nth(2);
+            MalSymbol key;
+            MalVal val;
+            Env let_env = new Env(env);
+            for(int i=0; i<((MalList)a1).size(); i+=2) {
+                key = (MalSymbol)((MalList)a1).nth(i);
+                val = ((MalList)a1).nth(i+1);
+                let_env.set(key, EVAL(val, let_env));
+            }
+            orig_ast = a2;
+            env = let_env;
+            break;
+        case "quote":
+            return ast.nth(1);
+        case "quasiquote":
+            orig_ast = quasiquote(ast.nth(1));
+            break;
+        case "defmacro!":
+            a1 = ast.nth(1);
+            a2 = ast.nth(2);
+            res = EVAL(a2, env);
+            ((MalFunction)res).setMacro();
+            env.set((MalSymbol)a1, res);
+            return res;
+        case "macroexpand":
+            a1 = ast.nth(1);
+            return macroexpand(a1, env);
+        case "try*":
+            try {
+                return EVAL(ast.nth(1), env);
+            } catch (Throwable t) {
+                if (ast.size() > 2) {
+                    MalVal exc;
+                    a2 = ast.nth(2);
+                    MalVal a20 = ((MalList)a2).nth(0);
+                    if (((MalSymbol)a20).getName().equals("catch*")) {
+                        if (t instanceof MalException) {
+                            exc = ((MalException)t).getValue();
+                        } else {
+                            StringWriter sw = new StringWriter();
+                            t.printStackTrace(new PrintWriter(sw));
+                            String tstr = sw.toString();
+                            exc = new MalString(t.getMessage() + ": " + tstr);
+                        }
+                        return EVAL(((MalList)a2).nth(2),
+                                    new Env(env, ((MalList)a2).slice(1,2),
+                                                 new MalList(exc)));
+                    }
+                }
+                throw t;
+            }
+        case "do":
+            eval_ast(ast.slice(1, ast.size()-1), env);
+            orig_ast = ast.nth(ast.size()-1);
+            break;
+        case "if":
+            a1 = ast.nth(1);
+            MalVal cond = EVAL(a1, env);
+            if (cond == types.Nil || cond == types.False) {
+                // eval false slot form
+                if (ast.size() > 3) {
+                    orig_ast = ast.nth(3);
+                } else {
+                    return types.Nil;
+                }
+            } else {
+                // eval true slot form
+                orig_ast = ast.nth(2);
+            }
+            break;
+        case "fn*":
+            final MalList a1f = (MalList)ast.nth(1);
+            final MalVal a2f = ast.nth(2);
+            final Env cur_env = env;
+            return new MalFunction (a2f, (mal.env.Env)env, a1f) {
+                public MalVal apply(MalList args) throws MalThrowable {
+                    return EVAL(a2f, new Env(cur_env, a1f, args));
+                }
+            };
+        default:
+            el = (MalList)eval_ast(ast, env);
+            MalFunction f = (MalFunction)el.nth(0);
+            MalVal fnast = f.getAst();
+            if (fnast != null) {
+                orig_ast = fnast;
+                env = f.genEnv(el.slice(1));
+            } else {
+                return f.apply(el.rest());
+            }
+        }
+
+        }
+    }
+
+    // print
+    public static String PRINT(MalVal exp) {
+        return printer._pr_str(exp, true);
+    }
+
+    // repl
+    public static MalVal RE(Env env, String str) throws MalThrowable {
+        return EVAL(READ(str), env);
+    }
+
+    public static void main(String[] args) throws MalThrowable {
+        String prompt = "user> ";
+
+        final Env repl_env = new Env(null);
+
+        // core.java: defined using Java
+        for (String key : core.ns.keySet()) {
+            repl_env.set(new MalSymbol(key), core.ns.get(key));
+        }
+        repl_env.set(new MalSymbol("eval"), new MalFunction() {
+            public MalVal apply(MalList args) throws MalThrowable {
+                return EVAL(args.nth(0), repl_env);
+            }
+        });
+        MalList _argv = new MalList();
+        for (Integer i=1; i < args.length; i++) {
+            _argv.conj_BANG(new MalString(args[i]));
+        }
+        repl_env.set(new MalSymbol("*ARGV*"), _argv);
+
+
+        // core.mal: defined using the language itself
+        RE(repl_env, "(def! *host-language* \"java\")");
+        RE(repl_env, "(def! not (fn* (a) (if a false true)))");
+        RE(repl_env, "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+        RE(repl_env, "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
+        RE(repl_env, "(defmacro! or (fn* (& xs) (if (empty? xs) nil (if (= 1 (count xs)) (first xs) `(let* (or_FIXME ~(first xs)) (if or_FIXME or_FIXME (or ~@(rest xs))))))))");
+        
+        Integer fileIdx = 0;
+        if (args.length > 0 && args[0].equals("--raw")) {
+            readline.mode = readline.Mode.JAVA;
+            fileIdx = 1;
+        }
+        if (args.length > fileIdx) {
+            RE(repl_env, "(load-file \"" + args[fileIdx] + "\")");
+            return;
+        }
+
+        // repl loop
+        RE(repl_env, "(println (str \"Mal [\" *host-language* \"]\"))");
+        while (true) {
+            String line;
+            try {
+                line = readline.readline(prompt);
+                if (line == null) { continue; }
+            } catch (readline.EOFException e) {
+                break;
+            } catch (IOException e) {
+                System.out.println("IOException: " + e.getMessage());
+                break;
+            }
+            try {
+                System.out.println(PRINT(RE(repl_env, line)));
+            } catch (MalContinue e) {
+                continue;
+            } catch (MalException e) {
+                System.out.println("Error: " + printer._pr_str(e.getValue(), false));
+                continue;
+            } catch (MalThrowable t) {
+                System.out.println("Error: " + t.getMessage());
+                continue;
+            } catch (Throwable t) {
+                System.out.println("Uncaught " + t + ": " + t.getMessage());
+                continue;
+            }
+        }
+    }
+}
-- 
cgit v1.2.3