switched null to nil

3 files changed, 5 insertions, 5 deletions

diff --git a/src/jvm/clojure/lang/BytecodeCompiler.java b/src/jvm/clojure/lang/BytecodeCompiler.java
index c8779ea0..61a8a5ad 100644
--- a/src/jvm/clojure/lang/BytecodeCompiler.java
+++ b/src/jvm/clojure/lang/BytecodeCompiler.java
@@ -890,7 +890,7 @@ static class InvokeExpr implements Expr{
 		PersistentVector argvs = PersistentVector.EMPTY;
 		for(int i = 0; i < args.count(); i++)
 			argvs = argvs.cons(((Expr) args.nth(i)).eval());
-		return fn.applyTo(RT.seq(argvs));
+		return Reflector.prepRet(fn.applyTo(RT.seq(argvs)));
 	}
 
 	public void emit(C context, FnExpr fn, GeneratorAdapter gen){
diff --git a/src/jvm/clojure/lang/LispReader.java b/src/jvm/clojure/lang/LispReader.java
index add1b67b..d93366f6 100644
--- a/src/jvm/clojure/lang/LispReader.java
+++ b/src/jvm/clojure/lang/LispReader.java
@@ -30,7 +30,7 @@ static Pattern symbolPat = Pattern.compile("[:]?([\\D&&[^:/]][^:/]*/)?[\\D&&[^:/
 static Pattern intPat = Pattern.compile("[-+]?[0-9]+\\.?");

 static Pattern ratioPat = Pattern.compile("([-+]?[0-9]+)/([0-9]+)");

 static Pattern floatPat = Pattern.compile("[-+]?[0-9]+(\\.[0-9]+)?([eE][-+]?[0-9]+)?");

-

+static final Symbol SLASH = Symbol.create("/");

 //static Pattern accessorPat = Pattern.compile("\\.[a-zA-Z_]\\w*");

 //static Pattern instanceMemberPat = Pattern.compile("\\.([a-zA-Z_][\\w\\.]*)\\.([a-zA-Z_]\\w*)");

 //static Pattern staticMemberPat = Pattern.compile("([a-zA-Z_][\\w\\.]*)\\.([a-zA-Z_]\\w*)");

@@ -223,14 +223,14 @@ static private Object readMember(PushbackReader r) throws Exception {
 */

 

 static private Object interpretToken(String s) throws Exception{

-	if(s.equals("null"))

+	if(s.equals("nil"))

 		{

 		return null;

 		}

 

 	else if(s.equals("/"))

 		{

-		return Symbol.create("/");

+		return SLASH;

 		}

 	Object ret = null;

 

diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 9727c56d..0fd64fe1 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -595,7 +595,7 @@ static public void print(Object x, Writer w) throws Exception{
 			}
 		}
 	if(x == null)
-		w.write("null");
+		w.write("nil");
 	else if(x instanceof ISeq)
 		{
 		w.write('(');