interim checkin, do not use

new constant handling

2 files changed, 9 insertions, 7 deletions

diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index cfd875fa..94555895 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -1215,6 +1215,7 @@ static class BooleanExpr extends LiteralExpr{
 final static BooleanExpr TRUE_EXPR = new BooleanExpr(true);
 final static BooleanExpr FALSE_EXPR = new BooleanExpr(false);
 
+/*
 static class NumExpr extends LiteralExpr{
 	final Num num;
 	final static Method numFromIntMethod = Method.getMethod("clojure.lang.Num from(int)");
@@ -1334,7 +1335,7 @@ static class CharExpr extends LiteralExpr{
 		return Character.class;
 	}
 }
-
+ */
 static class MonitorEnterExpr extends UntypedExpr{
 	final Expr target;
 
@@ -3099,12 +3100,12 @@ private static Expr analyze(C context, Object form, String name) throws Exceptio
 		return analyzeSymbol((Symbol) form);
 	else if(fclass == Keyword.class)
 		return registerKeyword((Keyword) form);
-	else if(form instanceof Num)
-		return new NumExpr((Num) form);
-	else if(fclass == String.class)
-		return new StringExpr((String) form);
-	else if(fclass == Character.class)
-		return new CharExpr((Character) form);
+//	else if(form instanceof Num)
+//		return new NumExpr((Num) form);
+//	else if(fclass == String.class)
+//		return new StringExpr((String) form);
+//	else if(fclass == Character.class)
+//		return new CharExpr((Character) form);
 	else if(form instanceof IPersistentCollection && ((IPersistentCollection) form).count() == 0)
 		return new EmptyExpr(form);
 	else if(form instanceof ISeq)
diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 6937afcb..c996b446 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -171,6 +171,7 @@ static AtomicInteger id = new AtomicInteger(1);
 
 static
 	{
+	OUT.setTag(Symbol.create("java.io.OutputStreamWriter"));
 	Var.intern(CLOJURE_NS, IN_NAMESPACE, inNamespace);
 	Var.intern(CLOJURE_NS, LOAD_FILE,
 	           new AFn(){