Merge branch '1.3-860/add-disable-locals-clearing' into pallet-1.3

Author: hugoduncan

src/jvm/clojure/lang/Compile.java

@@ -25,10 +25,12 @@ public class Compile{
 private static final String PATH_PROP = "clojure.compile.path";
 private static final String REFLECTION_WARNING_PROP = "clojure.compile.warn-on-reflection";
 private static final String UNCHECKED_MATH_PROP = "clojure.compile.unchecked-math";
+private static final String LOCALS_CLEARING_PROP = "clojure.compile.locals-clearing";
 private static final Var compile_path = RT.var("clojure.core", "*compile-path*");
 private static final Var compile = RT.var("clojure.core", "compile");
 private static final Var warn_on_reflection = RT.var("clojure.core", "*warn-on-reflection*");
 private static final Var unchecked_math = RT.var("clojure.core", "*unchecked-math*");
+private static final Var compiler_options = RT.var("clojure.core", "*compiler-options*");
 
 public static void main(String[] args) throws IOException{
 
@@ -47,10 +49,15 @@ public static void main(String[] args) throws IOException{
 
     boolean warnOnReflection = System.getProperty(REFLECTION_WARNING_PROP, "false").equals("true");
     boolean uncheckedMath = System.getProperty(UNCHECKED_MATH_PROP, "false").equals("true");
+    boolean localsClearing = System.getProperty(LOCALS_CLEARING_PROP, "true").equals("true");
 
 	try
 		{
-               Var.pushThreadBindings(RT.map(compile_path, path, warn_on_reflection, warnOnReflection, unchecked_math, uncheckedMath));
+               Var.pushThreadBindings(RT.map(compile_path, path,
+                                             warn_on_reflection, warnOnReflection,
+                                             unchecked_math, uncheckedMath,
+                                             compiler_options,
+                                             ((PersistentHashMap)compiler_options.deref()).assoc(RT.localsClearing, localsClearing)));
 
 		for(String lib : args)
         {

src/jvm/clojure/lang/Compiler.java

@@ -239,7 +239,6 @@ public class Compiler implements Opcodes{
 static final public Var ADD_ANNOTATIONS = Var.intern(Namespace.findOrCreate(Symbol.intern("clojure.core")),
                                             Symbol.intern("add-annotations"));
 
-
 //Integer
 static final public Var LINE = Var.create(0).setDynamic();
 
@@ -5426,8 +5425,8 @@ public static class LocalBinding{
 	public final int idx;
 	public final String name;
 	public final boolean isArg;
-    public final PathNode clearPathRoot;
-	public boolean canBeCleared = true;
+	public final PathNode clearPathRoot;
+	public boolean canBeCleared = (Boolean)((PersistentHashMap)RT.COMPILER_OPTIONS.deref()).valAt(RT.localsClearing);
 	public boolean recurMistmatch = false;
 
     public LocalBinding(int num, Symbol sym, Symbol tag, Expr init, boolean isArg,PathNode clearPathRoot)

src/jvm/clojure/lang/RT.java

@@ -213,6 +213,9 @@ public class RT{
 final static Var WARN_ON_REFLECTION = Var.intern(CLOJURE_NS, Symbol.intern("*warn-on-reflection*"), F).setDynamic();
 final static Var ALLOW_UNRESOLVED_VARS = Var.intern(CLOJURE_NS, Symbol.intern("*allow-unresolved-vars*"), F).setDynamic();
 
+final static Keyword localsClearing =  Keyword.intern("locals-clearing");
+final static Var COMPILER_OPTIONS = Var.intern(CLOJURE_NS, Symbol.intern("*compiler-options*"), PersistentHashMap.create(localsClearing, true)).setDynamic();
+
 final static Var IN_NS_VAR = Var.intern(CLOJURE_NS, Symbol.intern("in-ns"), F);
 final static Var NS_VAR = Var.intern(CLOJURE_NS, Symbol.intern("ns"), F);
 final static Var FN_LOADER_VAR = Var.intern(CLOJURE_NS, Symbol.intern("*fn-loader*"), null).setDynamic();