summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich Hickey <richhickey@gmail.com>2007-11-29 17:57:49 +0000
committerRich Hickey <richhickey@gmail.com>2007-11-29 17:57:49 +0000
commit512576388103ce0170701909d597a6b74e9bcb4d (patch)
tree8e24bd33a73474d8f63f5542529164b5634d8085 /src
parent5d6a640ae00f5694d5bd9acdf767c07e2b59f11d (diff)
added *print-meta*, defaults to nil
Diffstat (limited to 'src')
-rw-r--r--src/boot.clj2
-rw-r--r--src/jvm/clojure/lang/RT.java7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/boot.clj b/src/boot.clj
index 542a0e28..5baf8898 100644
--- a/src/boot.clj
+++ b/src/boot.clj
@@ -779,7 +779,7 @@
eval import unimport refer unrefer in-namespace unintern
into-array array
make-proxy implement
- prn print newline *out* *current-namespace*
+ prn print newline *out* *current-namespace* *print-meta*
doto memfn
read *in*
time
diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 82b31e56..78156532 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -23,7 +23,7 @@ final static public Var OUT =
Var.intern(Symbol.create("clojure", "*out*"), new OutputStreamWriter(System.out));
final static public Var IN =
Var.intern(Symbol.create("clojure", "*in*"),
- new LineNumberingPushbackReader(new InputStreamReader(System.in)));
+ new LineNumberingPushbackReader(new InputStreamReader(System.in)));
final static Keyword TAG_KEY = Keyword.intern("clojure", "tag");
final static Keyword ACTOR_KEY = Keyword.intern("clojure", "actor");
//final static public Var CURRENT_MODULE = Var.intern(Symbol.create("clojure", "current-module"),
@@ -112,6 +112,9 @@ Symbol.create("Exception"), "java.lang.Exception"
// Symbol.create("SortedSet"), "java.util.SortedSet"
);
+
+final static Var PRINT_META = Var.intern(Symbol.create("clojure", "*print-meta*"), null);
+
final static Var IMPORTS = Var.intern(Symbol.create("clojure", "*imports*"), DEFAULT_IMPORTS);
final static IFn inNamespace = new AFn(){
public Object invoke(Object arg1) throws Exception{
@@ -657,7 +660,7 @@ static public void print(Object x, Writer w) throws Exception{
if(x instanceof Obj)
{
Obj o = (Obj) x;
- if(RT.count(o.meta()) > 0)
+ if(RT.count(o.meta()) > 0 && PRINT_META.get() != null)
{
IPersistentMap meta = o.meta();
w.write("#^");